diff --git a/src/vs/workbench/parts/debug/common/debugModel.ts b/src/vs/workbench/parts/debug/common/debugModel.ts index 23f762661b4dcd0170f8c01f787fe28ed310dfef..02fae2419dcdc3ccf7b7d93f52456fbffe4888e7 100644 --- a/src/vs/workbench/parts/debug/common/debugModel.ts +++ b/src/vs/workbench/parts/debug/common/debugModel.ts @@ -496,12 +496,18 @@ export class Thread implements IThread { }); } - return session.exceptionInfo({ threadId: this.threadId }).then(exception => ({ - id: exception.body.exceptionId, - description: exception.body.description, - breakMode: exception.body.breakMode, - details: exception.body.details - })); + return session.exceptionInfo({ threadId: this.threadId }).then(exception => { + if (!exception) { + return null; + } + + return { + id: exception.body.exceptionId, + description: exception.body.description, + breakMode: exception.body.breakMode, + details: exception.body.details + }; + }); } return TPromise.as(null);