diff --git a/src/libgui/ObjectManipulator_create_new.cpp b/src/libgui/ObjectManipulator_create_new.cpp
index 4d289de9c..c8ea01184 100644
--- a/src/libgui/ObjectManipulator_create_new.cpp
+++ b/src/libgui/ObjectManipulator_create_new.cpp
@@ -302,7 +302,8 @@ FWObject* ObjectManipulator::createObject(const QString &objType,
         qDebug("libs->count()=%d", m_objectManipulator->libs->count() );
     }
 
-    while ( lib->getId()==FWObjectDatabase::STANDARD_LIB_ID ||
+    while ( lib == NULL ||
+            lib->getId()==FWObjectDatabase::STANDARD_LIB_ID ||
             lib->getId()==FWObjectDatabase::TEMPLATE_LIB_ID ||
             lib->getId()==FWObjectDatabase::DELETED_OBJECTS_ID  ||
             lib->isReadOnly() )
@@ -367,7 +368,8 @@ FWObject* ObjectManipulator::createObject(FWObject *parent,
                objType.toLatin1().constData(), objName.toLatin1().constData());
     }
 
-    while ( lib->getId()==FWObjectDatabase::STANDARD_LIB_ID ||
+    while ( lib == NULL ||
+            lib->getId()==FWObjectDatabase::STANDARD_LIB_ID ||
             lib->getId()==FWObjectDatabase::TEMPLATE_LIB_ID ||
             lib->getId()==FWObjectDatabase::DELETED_OBJECTS_ID  ||
             lib->isReadOnly() )