diff --git a/src/vs/workbench/common/editor/rangeDecorations.ts b/src/vs/workbench/common/editor/rangeDecorations.ts
index cecec707c43..62c1ccd9ec1 100644
--- a/src/vs/workbench/common/editor/rangeDecorations.ts
+++ b/src/vs/workbench/common/editor/rangeDecorations.ts
@@ -96,8 +96,10 @@ export class RangeHighlightDecorations implements IDisposable {
 	}
 
 	public dispose() {
-		this.removeHighlightRange();
-		this.disposeEditorListeners();
-		this.editor = null;
+		if (this.editor && this.editor.getModel()) {
+			this.removeHighlightRange();
+			this.disposeEditorListeners();
+			this.editor = null;
+		}
 	}
 }
\ No newline at end of file