diff --git a/mozilla/modules/plugin/base/src/nsPluginNativeWindowGtk2.cpp b/mozilla/modules/plugin/base/src/nsPluginNativeWindowGtk2.cpp
index 5260e784a93..f53d522729a 100644
--- a/mozilla/modules/plugin/base/src/nsPluginNativeWindowGtk2.cpp
+++ b/mozilla/modules/plugin/base/src/nsPluginNativeWindowGtk2.cpp
@@ -286,9 +286,12 @@ PRBool nsPluginNativeWindowGtk2::CanGetValueFromPlugin(nsCOMPtr<nsIPluginInstanc
 
           rv = pluginHost->GetPluginFactory("application/x-java-vm", &pluginFactory);
           if (NS_SUCCEEDED(rv) && pluginFactory) {
-            const char * jpiDescription;
+            const char * jpiDescription = NULL;
 
             pluginFactory->GetValue(nsPluginVariable_DescriptionString, (void*)&jpiDescription);
+            if (!jpiDescription)
+              return PR_FALSE;
+
             /** 
              * "Java(TM) Plug-in" is Sun's Java Plugin Trademark,
              * so we are sure that this is Sun 's Java Plugin if