diff --git a/extension.ts b/extension.ts
index 2707956fb..c2b1e36ae 100644
--- a/extension.ts
+++ b/extension.ts
@@ -46,7 +46,7 @@ export async function getAndUpdateModeHandler(): Promise<ModeHandler> {
         await handler.updateView(handler.vimState);
     }
 
-    if (oldHandler.vimState.focusChanged) {
+    if (oldHandler && oldHandler.vimState.focusChanged) {
         oldHandler.vimState.focusChanged = false;
         handler.vimState.focusChanged = true;
     }
diff --git a/src/mode/modeHandler.ts b/src/mode/modeHandler.ts
index 0780807b8..78432b6e9 100644
--- a/src/mode/modeHandler.ts
+++ b/src/mode/modeHandler.ts
@@ -866,10 +866,17 @@ export class ModeHandler implements vscode.Disposable {
             rangesToDraw.push(new vscode.Range(stop, stop.getRight()));
         }
 
+        // Draw marks
+        // I should re-enable this with a config setting at some point
+
+        /*
+
         for (const mark of this.vimState.historyTracker.getMarks()) {
             rangesToDraw.push(new vscode.Range(mark.position, mark.position.getRight()));
         }
 
+        */
+
         // Draw search highlight
 
         const searchState = vimState.searchState;