diff --git a/plugins/org.jkiss.dbeaver.ext.erd/src/org/jkiss/dbeaver/ext/erd/editor/ERDEditorPart.java b/plugins/org.jkiss.dbeaver.ext.erd/src/org/jkiss/dbeaver/ext/erd/editor/ERDEditorPart.java
index 8d9745ce9ea86b46e1325a5de6c765c67ea07a7a..dd12c47f59bb41021f61a83e2338232b301beb1f 100644
--- a/plugins/org.jkiss.dbeaver.ext.erd/src/org/jkiss/dbeaver/ext/erd/editor/ERDEditorPart.java
+++ b/plugins/org.jkiss.dbeaver.ext.erd/src/org/jkiss/dbeaver/ext/erd/editor/ERDEditorPart.java
@@ -1185,7 +1185,7 @@ public abstract class ERDEditorPart extends GraphicalEditorWithFlyoutPalette
         public void completeLoading(EntityDiagram result) {
             super.completeLoading(result);
             super.visualizeLoading();
-            if (!result.getEntities().isEmpty()) {
+            if (result != null && !result.getEntities().isEmpty()) {
                 setErrorMessage(null);
             }
             getGraphicalViewer().setContents(result);
diff --git a/plugins/org.jkiss.dbeaver.ext.erd/src/org/jkiss/dbeaver/ext/erd/figures/EntityDiagramFigure.java b/plugins/org.jkiss.dbeaver.ext.erd/src/org/jkiss/dbeaver/ext/erd/figures/EntityDiagramFigure.java
index ae38aae8ccf6bd2c2d2a53b648b596f26c2f10a3..5d838e7657900c0b2820f077c58e51d4a8d07026 100644
--- a/plugins/org.jkiss.dbeaver.ext.erd/src/org/jkiss/dbeaver/ext/erd/figures/EntityDiagramFigure.java
+++ b/plugins/org.jkiss.dbeaver.ext.erd/src/org/jkiss/dbeaver/ext/erd/figures/EntityDiagramFigure.java
@@ -78,9 +78,9 @@ public class EntityDiagramFigure extends FreeformLayer {
                         //setConstraint(hintFigure, );
                     } else {
                         hintFigure.setVisible(false);
+                        EntityDiagramFigure.this.removeFigureListener(this);
                     }
                 }
-                EntityDiagramFigure.this.removeFigureListener(this);
             }
         });
     }