From cb53ff5eb8f04a511d8cc62cdf7ac6aff87cd796 Mon Sep 17 00:00:00 2001
From: Daniel Imms <daimms@microsoft.com>
Date: Fri, 10 Mar 2017 04:07:28 -0800
Subject: [PATCH] Add null check to TerminalPanel.focus

Fixes #22368
---
 .../parts/terminal/electron-browser/terminalPanel.ts         | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/src/vs/workbench/parts/terminal/electron-browser/terminalPanel.ts b/src/vs/workbench/parts/terminal/electron-browser/terminalPanel.ts
index ed4b1adee216..fa39a0b55ebb 100644
--- a/src/vs/workbench/parts/terminal/electron-browser/terminalPanel.ts
+++ b/src/vs/workbench/parts/terminal/electron-browser/terminalPanel.ts
@@ -137,7 +137,10 @@ export class TerminalPanel extends Panel {
 	}
 
 	public focus(): void {
-		this._terminalService.getActiveInstance().focus(true);
+		const activeInstance = this._terminalService.getActiveInstance();
+		if (activeInstance) {
+			activeInstance.focus(true);
+		}
 	}
 
 	private _attachEventListeners(): void {