diff --git a/src/vs/workbench/parts/debug/electron-browser/callStackView.ts b/src/vs/workbench/parts/debug/electron-browser/callStackView.ts
index 19be49cfe8ca1b253bf30162559b7346f02eca84..2bfb89dfe02ec83c41ce147190b4624d6cb388a6 100644
--- a/src/vs/workbench/parts/debug/electron-browser/callStackView.ts
+++ b/src/vs/workbench/parts/debug/electron-browser/callStackView.ts
@@ -4,7 +4,7 @@
  *--------------------------------------------------------------------------------------------*/
 
 import * as nls from 'vs/nls';
-import { RunOnceScheduler } from 'vs/base/common/async';
+import { RunOnceScheduler, ignoreErrors } from 'vs/base/common/async';
 import * as dom from 'vs/base/browser/dom';
 import { IViewletViewOptions } from 'vs/workbench/browser/parts/views/viewsViewlet';
 import { IDebugService, State, IStackFrame, IDebugSession, IThread, CONTEXT_CALLSTACK_ITEM_TYPE } from 'vs/workbench/parts/debug/common/debug';
@@ -227,9 +227,9 @@ export class CallStackView extends ViewletPanel {
 				updateSelectionAndReveal(session);
 			}
 		} else {
-			const expansionsPromise = this.tree.expand(thread.session).then(() => this.tree.expand(thread));
+			const expansionsPromise = ignoreErrors(this.tree.expand(thread.session))
+				.then(() => ignoreErrors(this.tree.expand(thread)));
 			if (stackFrame) {
-				// TODO@isidor need better error handling
 				expansionsPromise.then(() => updateSelectionAndReveal(stackFrame));
 			}
 		}