From 274c899606b67cd0e13f3f92ec21fb17f126282f Mon Sep 17 00:00:00 2001
From: Max Shaposhnik <mshaposhnik@codenvy.com>
Date: Mon, 6 Mar 2017 16:18:05 +0200
Subject: [PATCH] Prevent NULL setting

---
 .../main/java/org/eclipse/che/ide/context/AppContextImpl.java | 4 +++-
 1 file changed, 3 insertions(+), 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
index 6c5b6c9d63f..2a2efce794f 100644
--- 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;