From 147bf90140f88e80077ead2ffb32ff991aa350a6 Mon Sep 17 00:00:00 2001
From: Yevhenii Voevodin <evoevodin@codenvy.com>
Date: Tue, 17 Jan 2017 17:31:54 +0200
Subject: [PATCH] Fix NPE introduced by #3701

---
 .../eclipse/che/api/workspace/server/WorkspaceRuntimes.java  | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/wsmaster/che-core-api-workspace/src/main/java/org/eclipse/che/api/workspace/server/WorkspaceRuntimes.java b/wsmaster/che-core-api-workspace/src/main/java/org/eclipse/che/api/workspace/server/WorkspaceRuntimes.java
index 339ce5cdb24..6257bc63182 100644
--- a/wsmaster/che-core-api-workspace/src/main/java/org/eclipse/che/api/workspace/server/WorkspaceRuntimes.java
+++ b/wsmaster/che-core-api-workspace/src/main/java/org/eclipse/che/api/workspace/server/WorkspaceRuntimes.java
@@ -1024,7 +1024,10 @@ private MachineAgentsLauncher(Map<String, ? extends ExtendedMachine> nameToMachi
 
         @Override
         public void started(Instance machine) throws ServerException {
-            launchAgents(machine, nameToMachine.get(machine.getConfig().getName()).getAgents());
+            ExtendedMachine extMachine = nameToMachine.get(machine.getConfig().getName());
+            if (extMachine != null) {
+                launchAgents(machine, extMachine.getAgents());
+            }
         }
     }