diff --git a/source/blender/src/drawview.c b/source/blender/src/drawview.c
index f5a915f171e..8367fdcc582 100644
--- a/source/blender/src/drawview.c
+++ b/source/blender/src/drawview.c
@@ -1293,24 +1293,26 @@ static void v3d_editarmature_buts(uiBlock *block, Object *ob, float lim)
 
 static void v3d_editmetaball_buts(uiBlock *block, Object *ob, float lim)
 {
-        extern MetaElem *lastelem;
-                                                                                                                             
-        uiBlockBeginAlign(block);
-        uiDefButF(block, NUM, B_RECALCMBALL, "LocX:", 10, 70, 140, 19, &lastelem->x, -lim, lim, 100, 3, "");
-        uiDefButF(block, NUM, B_RECALCMBALL, "LocY:", 10, 50, 140, 19, &lastelem->y, -lim, lim, 100, 3, "");
-        uiDefButF(block, NUM, B_RECALCMBALL, "LocZ:", 10, 30, 140, 19, &lastelem->z, -lim, lim, 100, 3, "");
-                                                                                                                             
-        uiBlockBeginAlign(block);
-        if(lastelem->type!=MB_BALL)
-        uiDefButF(block, NUM, B_RECALCMBALL, "dx:", 160, 70, 140, 19, &lastelem->expx, 0, lim, 100, 3, "");
-        if((lastelem->type!=MB_BALL) && (lastelem->type!=MB_TUBE))
-        uiDefButF(block, NUM, B_RECALCMBALL, "dy:", 160, 50, 140, 19, &lastelem->expy, 0, lim, 100, 3, "");
-        if((lastelem->type==MB_ELIPSOID) || (lastelem->type==MB_CUBE))
-        uiDefButF(block, NUM, B_RECALCMBALL, "dz:", 160, 30, 140, 19, &lastelem->expz, 0, lim, 100, 3, "");
-                                                                                                                             
-        uiBlockEndAlign(block);
-                                                                                                                             
-        uiDefButF(block, NUM, B_RECALCMBALL, "Stiffness:", 10, 100, 140, 19, &lastelem->s, 0, lim, 100, 3, "");
+	extern MetaElem *lastelem;
+																															
+	if(lastelem) {
+		uiBlockBeginAlign(block);
+		uiDefButF(block, NUM, B_RECALCMBALL, "LocX:", 10, 70, 140, 19, &lastelem->x, -lim, lim, 100, 3, "");
+		uiDefButF(block, NUM, B_RECALCMBALL, "LocY:", 10, 50, 140, 19, &lastelem->y, -lim, lim, 100, 3, "");
+		uiDefButF(block, NUM, B_RECALCMBALL, "LocZ:", 10, 30, 140, 19, &lastelem->z, -lim, lim, 100, 3, "");
+																																
+		uiBlockBeginAlign(block);
+		if(lastelem->type!=MB_BALL)
+		uiDefButF(block, NUM, B_RECALCMBALL, "dx:", 160, 70, 140, 19, &lastelem->expx, 0, lim, 100, 3, "");
+		if((lastelem->type!=MB_BALL) && (lastelem->type!=MB_TUBE))
+		uiDefButF(block, NUM, B_RECALCMBALL, "dy:", 160, 50, 140, 19, &lastelem->expy, 0, lim, 100, 3, "");
+		if((lastelem->type==MB_ELIPSOID) || (lastelem->type==MB_CUBE))
+		uiDefButF(block, NUM, B_RECALCMBALL, "dz:", 160, 30, 140, 19, &lastelem->expz, 0, lim, 100, 3, "");
+																																
+		uiBlockEndAlign(block);
+																																
+		uiDefButF(block, NUM, B_RECALCMBALL, "Stiffness:", 10, 100, 140, 19, &lastelem->s, 0, lim, 100, 3, "");
+	}
 }
 
 void do_viewbuts(unsigned short event)
diff --git a/source/blender/src/editobject.c b/source/blender/src/editobject.c
index 41f8ae538c4..209258326e5 100644
--- a/source/blender/src/editobject.c
+++ b/source/blender/src/editobject.c
@@ -85,10 +85,10 @@
 #include "BLI_editVert.h"
 #include "BLI_ghash.h"
 
-#include "BKE_nla.h"
 #include "BKE_utildefines.h"
 #include "BKE_anim.h"
 #include "BKE_blender.h"
+#include "BKE_booleanops.h"
 #include "BKE_curve.h"
 #include "BKE_displist.h"
 #include "BKE_effect.h"
@@ -103,13 +103,13 @@
 #include "BKE_material.h"
 #include "BKE_mball.h"
 #include "BKE_mesh.h"
+#include "BKE_nla.h"
 #include "BKE_object.h"
 #include "BKE_property.h"
 #include "BKE_sca.h"
 #include "BKE_scene.h"
 #include "BKE_subsurf.h"
 #include "BKE_texture.h"
-#include "BKE_booleanops.h"
 
 #include "BIF_gl.h"
 #include "BIF_graphics.h"