--- a/mobile/android/base/java/org/mozilla/gecko/javaaddons/JavaAddonManagerV1.java
+++ b/mobile/android/base/java/org/mozilla/gecko/javaaddons/JavaAddonManagerV1.java
@@ -121,19 +121,20 @@ public class JavaAddonManagerV1 implemen
                     if (callback == null) {
                         throw new IllegalArgumentException("callback must not be null");
                     }
                     final String guid = message.getString("guid");
                     final EventDispatcherImpl dispatcher = mGUIDToDispatcherMap.remove(guid);
                     if (dispatcher == null) {
                         Log.w(LOGTAG, "Attempting to unload addon with unknown associated dispatcher; ignoring.");
                         callback.sendSuccess(false);
+                    } else {
+                        dispatcher.unregisterAllEventListeners();
+                        callback.sendSuccess(true);
                     }
-                    dispatcher.unregisterAllEventListeners();
-                    callback.sendSuccess(true);
                 }
                 break;
             }
         } catch (Exception e) {
             Log.e(LOGTAG, "Exception handling message [" + event + "]", e);
             if (callback != null) {
                 callback.sendError("Exception handling message [" + event + "]: " + e.toString());
             }