From 40c2b11e24b96a064f5c49a172f5596afa429f00 Mon Sep 17 00:00:00 2001
From: Martin Aeschlimann <martinae@microsoft.com>
Date: Mon, 18 Mar 2019 13:03:06 +0100
Subject: [PATCH] Exceptions when trying to remove a registered JSON schema and
 disposing a model. Fixes Microsoft/monaco-editor#1254

---
 package.json            | 2 +-
 src/languageFeatures.ts | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/package.json b/package.json
index 346effbc..284ab5d1 100644
--- a/package.json
+++ b/package.json
@@ -20,7 +20,7 @@
   },
   "devDependencies": {
     "jsonc-parser": "^2.0.3",
-    "monaco-editor-core": "0.16.0",
+    "monaco-editor-core": "0.16.1",
     "monaco-languages": "1.7.0",
     "monaco-plugin-helpers": "^1.0.2",
     "requirejs": "^2.3.6",
diff --git a/src/languageFeatures.ts b/src/languageFeatures.ts
index 1205ac70..88085318 100644
--- a/src/languageFeatures.ts
+++ b/src/languageFeatures.ts
@@ -103,7 +103,7 @@ export class DiagnosticsAdapter {
 			return worker.doValidation(resource.toString()).then(diagnostics => {
 				const markers = diagnostics.map(d => toDiagnostics(resource, d));
 				let model = monaco.editor.getModel(resource);
-				if (model.getModeId() === languageId) {
+				if (model && model.getModeId() === languageId) {
 					monaco.editor.setModelMarkers(model, languageId, markers);
 				}
 			});