diff --git a/src/vs/editor/contrib/quickFix/browser/quickFix.ts b/src/vs/editor/contrib/quickFix/browser/quickFix.ts
index bc4b45960afd20ded77b8a5c42d0b27c7d46434a..124e1fa30fa1f4141c2b6ccb71bc4887c2552f55 100644
--- a/src/vs/editor/contrib/quickFix/browser/quickFix.ts
+++ b/src/vs/editor/contrib/quickFix/browser/quickFix.ts
@@ -62,10 +62,10 @@ export class QuickFixController implements IEditorContribution {
 	}
 
 	private _onQuickFixEvent(e: QuickFixComputeEvent): void {
-		if (e.type === 'manual') {
+		if (e && e.type === 'manual') {
 			this._quickFixContextMenu.show(e.fixes, e.position);
 
-		} else if (e.fixes) {
+		} else if (e && e.fixes) {
 			// auto magically triggered
 			// * update an existing list of code actions
 			// * manage light bulb
diff --git a/src/vs/editor/contrib/quickFix/browser/quickFixModel.ts b/src/vs/editor/contrib/quickFix/browser/quickFixModel.ts
index 19bd1d66e3ef0d0bda930adafa6f4721a3e1042b..ee282098c29d433b6b781f75c440548954f70aba 100644
--- a/src/vs/editor/contrib/quickFix/browser/quickFixModel.ts
+++ b/src/vs/editor/contrib/quickFix/browser/quickFixModel.ts
@@ -137,6 +137,10 @@ export class QuickFixModel {
 			&& !this._editor.getConfiguration().readOnly) {
 
 			this._quickFixOracle = new QuickFixOracle(this._editor, this._markerService, p => this._onDidChangeFixes.fire(p));
+
+		} else {
+			// signal unavailable
+			this._onDidChangeFixes.fire(undefined);
 		}
 	}