diff --git a/src/content/field.js b/src/content/field.js
index f6edb89aa4..77bd4b1c7a 100644
--- a/src/content/field.js
+++ b/src/content/field.js
@@ -1,4 +1,7 @@
-!(function () {
+// THIS FILE IS NOT CURRENTLY IN USE
+// IT IS NOT LOADED IN THE MANIFEST
+
+!(function () {
     var icons = [],
         setIconsIntervalId = null,
         setIconsIntervalRunCount = 0,
diff --git a/src/content/notificationBar.js b/src/content/notificationBar.js
index 888a22123e..964fe67b55 100644
--- a/src/content/notificationBar.js
+++ b/src/content/notificationBar.js
@@ -72,7 +72,10 @@
             inputs = document.getElementsByTagName('input');
 
         if (passwordId && passwordId !== '') {
-            formDataObj.passwordEl = formDataObj.formEl.querySelector('#' + passwordId);
+            try {
+                formDataObj.passwordEl = formDataObj.formEl.querySelector('#' + passwordId);
+            }
+            catch (e) { }
         }
         if (!formDataObj.passwordEl && passwordName !== '') {
             formDataObj.passwordEl = formDataObj.formEl.querySelector('input[name="' + passwordName + '"]');
@@ -88,7 +91,10 @@
         }
 
         if (usernameId && usernameId !== '') {
-            formDataObj.usernameEl = formDataObj.formEl.querySelector('#' + usernameId);
+            try {
+                formDataObj.usernameEl = formDataObj.formEl.querySelector('#' + usernameId);
+            }
+            catch (e) { }
         }
         if (!formDataObj.usernameEl && usernameName !== '') {
             formDataObj.usernameEl = formDataObj.formEl.querySelector('input[name="' + usernameName + '"]');
diff --git a/src/content/overlay.js b/src/content/overlay.js
index 4ab6fdf44d..821a44ed64 100644
--- a/src/content/overlay.js
+++ b/src/content/overlay.js
@@ -1,4 +1,7 @@
-!(function () {
+// THIS FILE IS NOT CURRENTLY IN USE
+// IT IS NOT LOADED IN THE MANIFEST
+
+!(function () {
     chrome.runtime.onMessage.addListener(function (msg, sender, sendResponse) {
         if (msg.command === 'openOverlayPopup') {
             closePopup();