diff --git a/mozilla/modules/plugin/bad/badapter.cpp b/mozilla/modules/plugin/bad/badapter.cpp
index 6f8037b7668..54c19927e3b 100644
--- a/mozilla/modules/plugin/bad/badapter.cpp
+++ b/mozilla/modules/plugin/bad/badapter.cpp
@@ -796,8 +796,12 @@ NPP_HandleEvent(NPP instance, void* event)
 		return eventHandled;
 		
 	nsIPluginInstance* pluginInstance = (nsIPluginInstance*) instance->pdata;
-	if( pluginInstance )
-		eventHandled = (int16) pluginInstance->HandleEvent((nsPluginEvent*) event );
+	if (pluginInstance) {
+        PRBool handled;
+		nsresult err = pluginInstance->HandleEvent((nsPluginEvent*)event, &handled);
+        if (err) return FALSE;
+        eventHandled = (handled == PR_TRUE);
+    }
 	
 	return eventHandled;
 }
diff --git a/mozilla/modules/plugin/samples/backward/badapter.cpp b/mozilla/modules/plugin/samples/backward/badapter.cpp
index 6f8037b7668..54c19927e3b 100644
--- a/mozilla/modules/plugin/samples/backward/badapter.cpp
+++ b/mozilla/modules/plugin/samples/backward/badapter.cpp
@@ -796,8 +796,12 @@ NPP_HandleEvent(NPP instance, void* event)
 		return eventHandled;
 		
 	nsIPluginInstance* pluginInstance = (nsIPluginInstance*) instance->pdata;
-	if( pluginInstance )
-		eventHandled = (int16) pluginInstance->HandleEvent((nsPluginEvent*) event );
+	if (pluginInstance) {
+        PRBool handled;
+		nsresult err = pluginInstance->HandleEvent((nsPluginEvent*)event, &handled);
+        if (err) return FALSE;
+        eventHandled = (handled == PR_TRUE);
+    }
 	
 	return eventHandled;
 }