From 824fdd8a592d3ef13726fed37f5986448b2e5c95 Mon Sep 17 00:00:00 2001
From: Jakub Valtar <jakub.valtar@gmail.com>
Date: Sat, 30 Apr 2016 16:50:45 +0200
Subject: [PATCH] Fix mode core library being null

---
 .../mode/java/pdex/ErrorCheckerService.java       | 15 ++++++++++++---
 1 file changed, 12 insertions(+), 3 deletions(-)

diff --git a/java/src/processing/mode/java/pdex/ErrorCheckerService.java b/java/src/processing/mode/java/pdex/ErrorCheckerService.java
index 0094eb0c6..b8fabbf24 100644
--- a/java/src/processing/mode/java/pdex/ErrorCheckerService.java
+++ b/java/src/processing/mode/java/pdex/ErrorCheckerService.java
@@ -568,9 +568,18 @@ public class ErrorCheckerService {
     }
 
     // Mode class path
-    String coreClassPath = mode.getCoreLibrary().getClassPath();
-    if (coreClassPath != null) {
-      classPath.append(File.pathSeparator).append(coreClassPath);
+    if (neededImports == null) {
+      String searchClassPath = mode.getSearchPath();
+      if (searchClassPath != null) {
+        classPath.append(File.pathSeparator).append(searchClassPath);
+      }
+    } else {
+      Library coreLibrary = mode.getCoreLibrary();
+      String coreClassPath = coreLibrary != null ?
+          coreLibrary.getClassPath() : mode.getSearchPath();
+      if (coreClassPath != null) {
+        classPath.append(File.pathSeparator).append(coreClassPath);
+      }
     }
 
     // Core libraries