diff --git a/src/explorerView/ExplorerView.ts b/src/explorerView/ExplorerView.ts
index 30ecfa11..3f2a4ab3 100644
--- a/src/explorerView/ExplorerView.ts
+++ b/src/explorerView/ExplorerView.ts
@@ -433,7 +433,9 @@ export class ExplorerView implements WebviewViewProvider, Disposable {
     }
 
     const article = ArticleHelper.getFrontMatter(editor);
-    this.pushMetadata(article!.data);
+    if (article?.data) {
+      this.pushMetadata(article!.data);
+    }
   }
 
   /**
diff --git a/src/panelWebView/components/TagPicker.tsx b/src/panelWebView/components/TagPicker.tsx
index 877515e5..19b254e6 100644
--- a/src/panelWebView/components/TagPicker.tsx
+++ b/src/panelWebView/components/TagPicker.tsx
@@ -186,7 +186,12 @@ export const TagPicker: React.FunctionComponent<ITagPickerProps> = (props: React
         }
       </Downshift>
 
-      <Tags values={selected.sort((a: string, b: string) => a.toLowerCase() < b.toLowerCase() ? -1 : 1 )} onRemove={onRemove} onCreate={onCreate} options={options} disableConfigurable={!!disableConfigurable} />
+      <Tags 
+        values={(selected || []).sort((a: string, b: string) => a.toLowerCase() < b.toLowerCase() ? -1 : 1 )} 
+        onRemove={onRemove} 
+        onCreate={onCreate} 
+        options={options} 
+        disableConfigurable={!!disableConfigurable} />
     </div>
   );
 };
\ No newline at end of file