diff --git a/static/js/idDialog.js b/static/js/idDialog.js
index cf9b630f..aab1adc6 100644
--- a/static/js/idDialog.js
+++ b/static/js/idDialog.js
@@ -189,7 +189,7 @@ pandora.ui.idDialog = function(data) {
         if (item.originalTitle == data.title) {
             item.originalTitle = highlightTitle(item.originalTitle);
         }
-        if (item.director) {
+        if (item.director && data.director) {
             item.director.forEach(function(director, i) {
                 if (Ox.contains(data.director, director)) {
                     item.director[i] = highlightTitle(director);
diff --git a/static/js/metadataDialog.js b/static/js/metadataDialog.js
index ea316f2d..944832e1 100644
--- a/static/js/metadataDialog.js
+++ b/static/js/metadataDialog.js
@@ -27,6 +27,10 @@ pandora.ui.metadataDialog = function(data) {
 
         that = data.imdbId ? updateDialog() : idDialog();
 
+    keys = keys.filter(function(key) {
+        return getItemKey(key);
+    });
+
     data.imdbId && getMetadata();
 
     function idDialog() {