Merge branch 'che#3620' into 3616

eclipse-che · Mar 6, 2017 · a41f88d · a41f88d
2 parents 52cf7bc + 274c899
commit a41f88d
Showing 1 changed file with 3 additions and 1 deletion.
diff --git a/ide/che-core-ide-app/src/main/java/org/eclipse/che/ide/context/AppContextImpl.java b/ide/che-core-ide-app/src/main/java/org/eclipse/che/ide/context/AppContextImpl.java
@@ -130,7 +130,9 @@ public Workspace getWorkspace() {
     public void setWorkspace(Workspace workspace) {
         if (workspace != null) {
             usersWorkspace = workspace;
-            runtime = new ActiveRuntime(workspace.getRuntime());
+            if (workspace.getRuntime() != null) {
+                runtime = new ActiveRuntime(workspace.getRuntime());
+            }
         } else {
             usersWorkspace = null;
             runtime = null;