From 3446ff88cf05b2862a6a7cfc73d4e6cb52d76b1d Mon Sep 17 00:00:00 2001
From: Yurong He <43652751+YurongHe@users.noreply.github.com>
Date: Wed, 5 Dec 2018 14:21:14 -0800
Subject: [PATCH] Fixed #3472 check SaveKernelInfo not null (#3473)

---
 src/sql/parts/notebook/models/sparkMagicContexts.ts | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/src/sql/parts/notebook/models/sparkMagicContexts.ts b/src/sql/parts/notebook/models/sparkMagicContexts.ts
index 986158fdf2..edffd5b70c 100644
--- a/src/sql/parts/notebook/models/sparkMagicContexts.ts
+++ b/src/sql/parts/notebook/models/sparkMagicContexts.ts
@@ -143,8 +143,10 @@ export class SparkMagicContexts {
 		let foundSavedKernelInSpecs;
 		let defaultKernel;
 		if (specs) {
-			foundSavedKernelInSpecs = specs.kernels.find((kernel) => kernel.name === savedKernelInfo.name);
 			defaultKernel = specs.kernels.find((kernel) => kernel.name === specs.defaultKernel);
+			if (savedKernelInfo) {
+				foundSavedKernelInSpecs = specs.kernels.find((kernel) => kernel.name === savedKernelInfo.name);
+			}
 		}
 		let profile = connectionInfo as IConnectionProfile;
 		if (foundSavedKernelInSpecs && specs && connectionInfo && profile.providerName === notebookConstants.hadoopKnoxProviderName) {