diff --git a/README.md b/README.md
index 28d5151..a720096 100644
--- a/README.md
+++ b/README.md
@@ -27,6 +27,9 @@ only tested on Ubuntu and OSX, so may not other Linuxs, and/or Windows
 
 ## Release Notes
 
+### 0.1.2
+fixed issue [#12](https://github.com/nexus-uw/vscode-gtm/issues/12) and [#7](https://github.com/nexus-uw/vscode-gtm/issues/7)
+
 ### 0.1.1 (arbitrary minor version bump)
 fixed https://github.com/nexus-uw/vscode-gtm/issues/5
 updated README to have proper version
diff --git a/src/extension.ts b/src/extension.ts
index 36be211..61a59e3 100644
--- a/src/extension.ts
+++ b/src/extension.ts
@@ -25,9 +25,9 @@ export function activate(context: vscode.ExtensionContext) {
   // check if gtm is installed + available
   run_cmd('gtm', ['verify', '>= 1.2.1'])
     .then((res: Result) => {
-      if(res.output != 'true'){
-         vscode.window.showWarningMessage('Installed gtm version is below v1.2.1. Please update your gtm installation.');
-       }
+      if (res.output != 'true') {
+        vscode.window.showWarningMessage('Installed gtm version is below v1.2.1. Please update your gtm installation.');
+      }
     }, (res: Result) => {
       if (res.code < 0) {
         vscode.window.showErrorMessage('gtm is not available on your $PATH. please install it first');
@@ -40,7 +40,7 @@ export function activate(context: vscode.ExtensionContext) {
 
   let gtmStatusBar = new GTMStatusBar()
 
-  function handleUpdateEvent(fileName: string){
+  function handleUpdateEvent(fileName: string) {
     const now = new Date();
     // if a new file is being saved OR it have been at least MIN_UPDATE_FREQUENCE_MS, record it
     if (fileName !== lastSavedFileName || (now.getTime() - lastUpdated.getTime()) >= MIN_UPDATE_FREQUENCE_MS) {
@@ -55,10 +55,20 @@ export function activate(context: vscode.ExtensionContext) {
   vscode.workspace.onDidSaveTextDocument((e: vscode.TextDocument) => handleUpdateEvent(e.fileName), this, subscriptions);
 
   // report to gtm everytime the user's selection of text changes
-  vscode.window.onDidChangeTextEditorSelection((e:vscode.TextEditorSelectionChangeEvent) => handleUpdateEvent(e.textEditor.document.fileName), this, subscriptions);
+  vscode.window.onDidChangeTextEditorSelection((e: vscode.TextEditorSelectionChangeEvent) => {
+    if (e && e.textEditor && e.textEditor.document) {
+      handleUpdateEvent(e.textEditor.document.fileName);
+    }
+  }, this, subscriptions);
 
   // report  to gtm everytime the user switches textEditors
-  vscode.window.onDidChangeActiveTextEditor((e:vscode.TextEditor) => handleUpdateEvent(e.document.fileName), this, subscriptions);
+  vscode.window.onDidChangeActiveTextEditor((e: vscode.TextEditor) => {
+    // Note that the event also fires when the active editor changes to undefined.
+    if (e && e.document) {
+      handleUpdateEvent(e.document.fileName);
+    }
+
+  }, this, subscriptions);
 }
 
 class GTMStatusBar {
@@ -66,21 +76,21 @@ class GTMStatusBar {
 
   public updateStatus(statusText: string) {
 
-      // Create as needed
-      if (!this.statusBarItem) {
-          this.statusBarItem = vscode.window.createStatusBarItem(vscode.StatusBarAlignment.Left);
-      }
+    // Create as needed
+    if (!this.statusBarItem) {
+      this.statusBarItem = vscode.window.createStatusBarItem(vscode.StatusBarAlignment.Left);
+    }
 
-      // Get the current text editor
-      let editor = vscode.window.activeTextEditor;
-      if (!editor) {
-          this.statusBarItem.hide();
-          return;
-      }
+    // Get the current text editor
+    let editor = vscode.window.activeTextEditor;
+    if (!editor) {
+      this.statusBarItem.hide();
+      return;
+    }
 
-      // Update the status bar
-      this.statusBarItem.text = statusText;
-      this.statusBarItem.show();
+    // Update the status bar
+    this.statusBarItem.text = statusText;
+    this.statusBarItem.show();
   }
 }