From d0acb51fd7338dfeb5ee1ec304ca7f626a5efd0b Mon Sep 17 00:00:00 2001
From: Chris LaFreniere <40371649+chlafreniere@users.noreply.github.com>
Date: Fri, 11 Jan 2019 10:36:36 -0800
Subject: [PATCH] Fix contentManager undefined when builtin manager used
 (#3710)

* Fix for contentManager undefined for builtin manager

* Clean up code some more
---
 src/sql/parts/notebook/models/notebookModel.ts | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/src/sql/parts/notebook/models/notebookModel.ts b/src/sql/parts/notebook/models/notebookModel.ts
index 2c7064c3ea..09fdfe9a0b 100644
--- a/src/sql/parts/notebook/models/notebookModel.ts
+++ b/src/sql/parts/notebook/models/notebookModel.ts
@@ -76,7 +76,11 @@ export class NotebookModel extends Disposable implements INotebookModel {
 	}
 
 	public get notebookManagers(): INotebookManager[] {
-		return this.notebookOptions.notebookManagers.filter(manager => manager.providerId !== DEFAULT_NOTEBOOK_PROVIDER);
+		let notebookManagers = this.notebookOptions.notebookManagers.filter(manager => manager.providerId !== DEFAULT_NOTEBOOK_PROVIDER);
+		if (!notebookManagers.length) {
+			return this.notebookOptions.notebookManagers;
+		}
+		return notebookManagers;
 	}
 
 	public get notebookManager(): INotebookManager {
@@ -424,6 +428,9 @@ export class NotebookModel extends Disposable implements INotebookModel {
 				await this.loadActiveContexts(e);
 			});
 		});
+		if (!this.notebookManager) {
+			return;
+		}
 		try {
 			let sessionManager = this.notebookManager.sessionManager;
 			if (sessionManager) {