diff --git a/org.fortiss.tooling.base.ui/trunk/src/org/fortiss/tooling/base/ui/annotation/view/AnnotationViewPartBase.java b/org.fortiss.tooling.base.ui/trunk/src/org/fortiss/tooling/base/ui/annotation/view/AnnotationViewPartBase.java
index 6e31d43a7493c0319b283451eb6287ca0b485822..3cd49b114a2f50b98d9a46b168de2bbd1430c746 100644
--- a/org.fortiss.tooling.base.ui/trunk/src/org/fortiss/tooling/base/ui/annotation/view/AnnotationViewPartBase.java
+++ b/org.fortiss.tooling.base.ui/trunk/src/org/fortiss/tooling/base/ui/annotation/view/AnnotationViewPartBase.java
@@ -99,7 +99,7 @@ public abstract class AnnotationViewPartBase extends ViewPart implements ISelect
 				// PlatformArchitectureDiagramEditPart
 				DiagramEditPartBase<?> diagramPart =
 						SelectionUtils.checkAndPickFirst(selection, DiagramEditPartBase.class);
-				if(diagramPart != null) {
+				if(diagramPart != null && diagramPart.getModel() instanceof IModelElement) {
 					currentlySelectedObject = (IModelElement)diagramPart.getModel();
 				}
 			}