diff --git a/org.fortiss.tooling.kernel.ui/trunk/src/org/fortiss/tooling/kernel/ui/internal/editor/ExtendableMultiPageEditor.java b/org.fortiss.tooling.kernel.ui/trunk/src/org/fortiss/tooling/kernel/ui/internal/editor/ExtendableMultiPageEditor.java
index a8efaf3ede596da1243a22c1f93d6983c022b5f2..467ad0de4891502edcfd97f3471e09f847ced83b 100644
--- a/org.fortiss.tooling.kernel.ui/trunk/src/org/fortiss/tooling/kernel/ui/internal/editor/ExtendableMultiPageEditor.java
+++ b/org.fortiss.tooling.kernel.ui/trunk/src/org/fortiss/tooling/kernel/ui/internal/editor/ExtendableMultiPageEditor.java
@@ -56,7 +56,7 @@ import org.fortiss.tooling.kernel.ui.util.PropertiesConstantUtils;
  * @author hoelzl
  * @author $Author$
  * @version $Rev$
- * @ConQAT.Rating GREEN Hash: ECF3F995688AF9E3075A42497357703A
+ * @ConQAT.Rating YELLOW Hash: 28D4D48E084F0114286B0F1346BBEA87
  */
 @SuppressWarnings("rawtypes")
 public class ExtendableMultiPageEditor extends MultiPageEditorPart implements
@@ -152,8 +152,18 @@ public class ExtendableMultiPageEditor extends MultiPageEditorPart implements
 			throw new PartInitException("Missing model element handler!");
 		}
 
-		setPartName(handler.getName(editedObject));
-		setContentDescription(handler.getDescription(editedObject));
+		String name = handler.getName(editedObject);
+		if (name == null) {
+			name = "";
+		}
+		setPartName(name);
+
+		String desc = handler.getDescription(editedObject);
+		if (desc == null) {
+			desc = "";
+		}
+		setContentDescription(desc);
+
 		setTitleImage(handler.getIcon());
 
 		editedObject.eAdapters().add(editedObjectChangeAdapter);