diff --git a/source/blender/blenkernel/intern/effect.c b/source/blender/blenkernel/intern/effect.c
index b26be057879..98810ede1ce 100644
--- a/source/blender/blenkernel/intern/effect.c
+++ b/source/blender/blenkernel/intern/effect.c
@@ -1261,7 +1261,16 @@ void build_particle_system(Object *ob)
 	}
 	
 	/* init */
+	
+		/* this call returns NULL during editmode, just ignore it and
+		 * particles should be recalc'd on exit.
+		 */
 	dm = mesh_get_derived_final(ob, &dmNeedsFree);
+	if (!dm) {
+		waitcursor(0);
+		return;
+	}
+
 	dlm = dm->convertToDispListMesh(dm);
 	totvert = dlm->totvert;