diff --git a/browser-plugin/browser-plugin.c b/browser-plugin/browser-plugin.c
index 17a895592..d2685887e 100644
--- a/browser-plugin/browser-plugin.c
+++ b/browser-plugin/browser-plugin.c
@@ -822,8 +822,8 @@ plugin_object_set_callback (NPObject        **listener,
 
   if (NPVARIANT_IS_OBJECT (*value))
     {
-      funcs.retainobject (*listener);
       *listener = NPVARIANT_TO_OBJECT (*value);
+      funcs.retainobject (*listener);
     }
 
   return TRUE;
@@ -836,6 +836,8 @@ plugin_object_set_property (NPObject        *npobj,
 {
   PluginObject *obj;
 
+  obj = (PluginObject *)npobj;
+
   if (name == onextension_changed_id)
     return plugin_object_set_callback (&obj->listener, value);