diff --git a/src/vs/workbench/parts/terminal/electron-browser/terminalPanel.ts b/src/vs/workbench/parts/terminal/electron-browser/terminalPanel.ts
index ad5fa77d8cac7078e1400130665da975f05c3e33..0b6d6c6a1d29eb5cfd9e220c925f83c3dbf464b7 100644
--- a/src/vs/workbench/parts/terminal/electron-browser/terminalPanel.ts
+++ b/src/vs/workbench/parts/terminal/electron-browser/terminalPanel.ts
@@ -217,6 +217,9 @@ export class TerminalPanel extends Panel {
 	}
 
 	private setTerminalTheme(themeId: string) {
+		if (!this.terminal) {
+			return;
+		}
 		let baseThemeId = getBaseThemeId(themeId);
 		this.terminal.colors = DEFAULT_ANSI_COLORS[baseThemeId];
 		this.terminal.refresh(0, this.terminal.rows);
@@ -227,6 +230,9 @@ export class TerminalPanel extends Panel {
 	}
 
 	private focusTerminal(force?: boolean): void {
+		if (!this.terminal) {
+			return;
+		}
 		let text = window.getSelection().toString();
 		if (!text || force) {
 			this.terminal.focus();