Merge branch 'master' of github.com:mattcasters/pentaho-pdi-dataset

mattcasters · Mar 29, 2019 · 16174ca · 16174ca
2 parents 6094fab + 8450d06
commit 16174ca
Showing 1 changed file with 4 additions and 1 deletion.
diff --git a/src/main/java/org/pentaho/di/dataset/spoon/DataSetHelper.java b/src/main/java/org/pentaho/di/dataset/spoon/DataSetHelper.java
@@ -104,7 +104,10 @@ public static DataSetHelper getInstance() {
     if ( instance == null ) {
       instance = new DataSetHelper();
       Spoon spoon = ( (Spoon) SpoonFactory.getInstance() );
-      spoon.addSpoonMenuController( instance );
+
+      if (spoon != null) {
+        spoon.addSpoonMenuController(instance);
+      }
     }
     return instance;
   }