From 1e5a58880cd7d7ac0f66dcfe9d224c6a1e2c42c9 Mon Sep 17 00:00:00 2001
From: serge-rider <serge@jkiss.org>
Date: Sun, 15 Apr 2018 01:01:28 +0300
Subject: [PATCH] ERD load fix (NPE)

---
 .../org/jkiss/dbeaver/ext/erd/editor/ERDEditorEmbedded.java  | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/plugins/org.jkiss.dbeaver.ext.erd/src/org/jkiss/dbeaver/ext/erd/editor/ERDEditorEmbedded.java b/plugins/org.jkiss.dbeaver.ext.erd/src/org/jkiss/dbeaver/ext/erd/editor/ERDEditorEmbedded.java
index 9c8e89c119..e96995ee0a 100644
--- a/plugins/org.jkiss.dbeaver.ext.erd/src/org/jkiss/dbeaver/ext/erd/editor/ERDEditorEmbedded.java
+++ b/plugins/org.jkiss.dbeaver.ext.erd/src/org/jkiss/dbeaver/ext/erd/editor/ERDEditorEmbedded.java
@@ -247,7 +247,10 @@ public class ERDEditorEmbedded extends ERDEditorPart implements IDatabaseEditor,
                 Collection<? extends DBSEntityAssociation> fks = rootTable.getAssociations(monitor);
                 if (fks != null) {
                     for (DBSEntityAssociation fk : fks) {
-                        result.add(fk.getAssociatedEntity());
+                        DBSEntity associatedEntity = fk.getAssociatedEntity();
+                        if (associatedEntity != null) {
+                            result.add(associatedEntity);
+                        }
                     }
                 }
                 monitor.worked(1);
-- 
GitLab