Index: trunk/src_plugins/ch_editpoint/ch_editpoint.c
===================================================================
--- trunk/src_plugins/ch_editpoint/ch_editpoint.c	(revision 32967)
+++ trunk/src_plugins/ch_editpoint/ch_editpoint.c	(revision 32968)
@@ -156,7 +156,7 @@
 	pcb_crosshair_t *ch = argv[1].d.p;
 	if (conf_ch_editpoint.plugins.ch_editpoint.enable) {
 		const rnd_tool_t *tool = rnd_tool_get(rnd_conf.editor.mode);
-		if (tool->user_flags & PCB_TLF_EDIT)
+		if ((tool != NULL) && (tool->user_flags & PCB_TLF_EDIT))
 			editpoint_work(ch, ch->X, ch->Y);
 	}
 }
Index: trunk/src_plugins/ch_onpoint/ch_onpoint.c
===================================================================
--- trunk/src_plugins/ch_onpoint/ch_onpoint.c	(revision 32967)
+++ trunk/src_plugins/ch_onpoint/ch_onpoint.c	(revision 32968)
@@ -197,7 +197,7 @@
 	pcb_crosshair_t *ch = argv[1].d.p;
 	if (conf_core.editor.highlight_on_point) {
 		const rnd_tool_t *tool = rnd_tool_get(rnd_conf.editor.mode);
-		if (tool->user_flags & PCB_TLF_EDIT)
+		if ((tool != NULL) && (tool->user_flags & PCB_TLF_EDIT))
 			onpoint_work(ch, ch->X, ch->Y);
 	}
 }