diff --git a/mozilla/suite/common/contentAreaClick.js b/mozilla/suite/common/contentAreaClick.js
index 14c928eb699..bac1135e8c7 100644
--- a/mozilla/suite/common/contentAreaClick.js
+++ b/mozilla/suite/common/contentAreaClick.js
@@ -113,7 +113,14 @@
   {
     var target = event.target;
     var linkNode;
-    switch (target.localName.toLowerCase()) {
+
+    var local_name = target.localName;
+
+    if (local_name) {
+      local_name.toLowerCase();
+    }
+
+    switch (local_name) {
       case "a":
         linkNode = target;
         break;
diff --git a/mozilla/suite/common/contentAreaDD.js b/mozilla/suite/common/contentAreaDD.js
index b4e944d1ec6..408a84c29e1 100644
--- a/mozilla/suite/common/contentAreaDD.js
+++ b/mozilla/suite/common/contentAreaDD.js
@@ -87,8 +87,14 @@ var contentAreaDNDObserver = {
         {
           if (aEvent.altKey && findParentNode(draggedNode, 'a'))
             return false;
-          
-          switch (draggedNode.localName.toUpperCase())
+
+          var local_name = draggedNode.localName;
+
+          if (local_name) {
+            local_name.toUpperCase();
+          }
+
+          switch (local_name)
             {
               case 'AREA':
               case 'IMG':