diff --git a/mozilla/content/base/src/nsObjectLoadingContent.cpp b/mozilla/content/base/src/nsObjectLoadingContent.cpp
index 6d12241b272..2688a2bfe0a 100644
--- a/mozilla/content/base/src/nsObjectLoadingContent.cpp
+++ b/mozilla/content/base/src/nsObjectLoadingContent.cpp
@@ -845,7 +845,7 @@ nsObjectLoadingContent::GetCapabilities() const
 void
 nsObjectLoadingContent::Fallback(PRBool aNotify)
 {
-  AutoNotifier(this, aNotify);
+  AutoNotifier notifier(this, aNotify);
 
   UnloadContent();
 }
diff --git a/mozilla/content/html/content/src/nsHTMLAppletElement.cpp b/mozilla/content/html/content/src/nsHTMLAppletElement.cpp
index 5c21a580867..a217fb0b917 100644
--- a/mozilla/content/html/content/src/nsHTMLAppletElement.cpp
+++ b/mozilla/content/html/content/src/nsHTMLAppletElement.cpp
@@ -295,8 +295,15 @@ void
 nsHTMLAppletElement::StartAppletLoad(PRBool aNotify)
 {
   nsAutoString uri;
-  GetAttr(kNameSpaceID_None, nsHTMLAtoms::code, uri);
-  ObjectURIChanged(uri, aNotify, NS_LITERAL_CSTRING("application/x-java-vm"), PR_TRUE);
+  nsresult rv = GetAttr(kNameSpaceID_None, nsHTMLAtoms::code, uri);
+  if (rv != NS_CONTENT_ATTR_NOT_THERE) {
+    ObjectURIChanged(uri, aNotify,
+                     NS_LITERAL_CSTRING("application/x-java-vm"), PR_TRUE);
+  } else {
+    // The constructor set the type to eType_Plugin; but if we have no code
+    // attribute, then we aren't really a plugin
+    Fallback(aNotify);
+  }
 }
 
 PRInt32