diff --git a/source/blender/src/header_node.c b/source/blender/src/header_node.c
index 11cfef36761..91e421736f2 100644
--- a/source/blender/src/header_node.c
+++ b/source/blender/src/header_node.c
@@ -152,6 +152,10 @@ static void do_node_selectmenu(void *arg, int event)
 {
 	SpaceNode *snode= curarea->spacedata.first; 
 	
+	/* functions in editnode.c assume there's a tree */
+	if(snode->nodetree==NULL)
+		return;
+	
 	switch(event) {
 		case 1: /* border select */
 			node_border_select(snode);
@@ -415,7 +419,9 @@ static void do_node_nodemenu(void *arg, int event)
 	SpaceNode *snode= curarea->spacedata.first; 
 	int fromlib=0;
 	
-	if(snode->nodetree==NULL) return;
+	/* functions in editnode.c assume there's a tree */
+	if(snode->nodetree==NULL)
+		return;
 	fromlib= (snode->id && snode->id->lib);
 	
 	switch(event) {
diff --git a/source/blender/src/space.c b/source/blender/src/space.c
index 196f0a340c1..235c9bcea4b 100644
--- a/source/blender/src/space.c
+++ b/source/blender/src/space.c
@@ -3423,7 +3423,7 @@ static void winqreadbutspace(ScrArea *sa, void *spacedata, BWinEvent *evt)
 				sa= curarea;
 				areawinset(sa3d->win);
 				
-				if(event==PKEY) start_game();
+				if(event==PKEY && G.qual==0) start_game();
 				else if(event==ZKEY) toggle_shading();
 				else persptoetsen(event);