diff --git a/build_num b/build_num
index 4fbc651d7..2519f339b 100644
--- a/build_num
+++ b/build_num
@@ -1 +1 @@
-#define BUILD_NUM 3212
+#define BUILD_NUM 3213
diff --git a/src/gui/ObjectManipulator.cpp b/src/gui/ObjectManipulator.cpp
index 76b991f9d..e64c47829 100644
--- a/src/gui/ObjectManipulator.cpp
+++ b/src/gui/ObjectManipulator.cpp
@@ -852,6 +852,8 @@ void ObjectManipulator::getMenuState(bool haveMoveTargets,
 
     FWObject *current_library = getCurrentLib();
 
+    if (getCurrentObjectTree()==NULL) return;
+
     vector<FWObject*> so = getCurrentObjectTree()->getSelectedObjects();
     for (vector<FWObject*>::iterator i=so.begin();  i!=so.end(); ++i)
     {