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) {