diff --git a/plugins/javaFX/FxBuilderEmbedder/lib/embedder.jar b/plugins/javaFX/FxBuilderEmbedder/lib/embedder.jar
index b18abec35c9b..1e9d59a57086 100644
Binary files a/plugins/javaFX/FxBuilderEmbedder/lib/embedder.jar and b/plugins/javaFX/FxBuilderEmbedder/lib/embedder.jar differ
diff --git a/plugins/javaFX/FxBuilderEmbedder/src/org/jetbrains/plugins/javaFX/sceneBuilder/SceneBuilderImpl.java b/plugins/javaFX/FxBuilderEmbedder/src/org/jetbrains/plugins/javaFX/sceneBuilder/SceneBuilderImpl.java
index 65b15576c6a3..ba484bf35fa3 100644
--- a/plugins/javaFX/FxBuilderEmbedder/src/org/jetbrains/plugins/javaFX/sceneBuilder/SceneBuilderImpl.java
+++ b/plugins/javaFX/FxBuilderEmbedder/src/org/jetbrains/plugins/javaFX/sceneBuilder/SceneBuilderImpl.java
@@ -120,8 +120,12 @@ public class SceneBuilderImpl implements SceneBuilder {
   @Override
   public void close() {
     if (myEditorController != null) {
-      myEditorController.getSelection().revisionProperty().removeListener(mySelectionListener);
-      myEditorController.getJobManager().revisionProperty().removeListener(myListener);
+      if (mySelectionListener != null) {
+        myEditorController.getSelection().revisionProperty().removeListener(mySelectionListener);
+      }
+      if (myListener != null) {
+        myEditorController.getJobManager().revisionProperty().removeListener(myListener);
+      }
     }
   }