From ba40f876df0523728a31fb2203de3780507d61d6 Mon Sep 17 00:00:00 2001
From: Don Jayamanne <don.jayamanne@yahoo.com>
Date: Tue, 5 Jun 2018 11:24:14 -0700
Subject: [PATCH] Aadd better error handling for parsing responses received
 from jedi

---
 news/3 Code Health/1867.md        |  1 +
 src/client/providers/jediProxy.ts | 10 ++++++++--
 2 files changed, 9 insertions(+), 2 deletions(-)
 create mode 100644 news/3 Code Health/1867.md

diff --git a/news/3 Code Health/1867.md b/news/3 Code Health/1867.md
new file mode 100644
index 000000000000..57590fb445fb
--- /dev/null
+++ b/news/3 Code Health/1867.md	
@@ -0,0 +1 @@
+Add better exception handling when parsing responses received from the Jedi language service.
diff --git a/src/client/providers/jediProxy.ts b/src/client/providers/jediProxy.ts
index 8d7811e161b8..73e1dbe44992 100644
--- a/src/client/providers/jediProxy.ts
+++ b/src/client/providers/jediProxy.ts
@@ -391,9 +391,15 @@ export class JediProxy implements Disposable {
                 }
 
                 responses.forEach((response) => {
+                    if (!response) {
+                        return;
+                    }
                     const responseId = JediProxy.getProperty<number>(response, 'id');
-                    const cmd = <IExecutionCommand<ICommandResult>>this.commands.get(responseId);
-                    if (cmd === null) {
+                    if (!this.commands.has(responseId)) {
+                        return;
+                    }
+                    const cmd = this.commands.get(responseId);
+                    if (!cmd) {
                         return;
                     }
                     this.lastCmdIdProcessed = cmd.id;