diff --git a/src/extension-runners/firefox-android.js b/src/extension-runners/firefox-android.js
index 4584633d76..9b164d42c5 100644
--- a/src/extension-runners/firefox-android.js
+++ b/src/extension-runners/firefox-android.js
@@ -141,6 +141,14 @@ export class FirefoxAndroidExtensionRunner {
     // NOTE: running Firefox for Android on the Android Emulator can be
     // pretty slow, we can run the following 3 steps in parallel to speed up
     // it a bit.
+    // Call all the registered cleanup callbacks.
+    for (const fn of this.cleanupCallbacks) {
+      try {
+        fn();
+      } catch (error) {
+        log.error(error);
+      }
+    }
     await Promise.all([
       // Start Firefox for Android instance if not started yet.
       // (Fennec would run in an temporary profile and so it is explicitly
diff --git a/src/extension-runners/index.js b/src/extension-runners/index.js
index 19fd60bc78..8a31bb8990 100644
--- a/src/extension-runners/index.js
+++ b/src/extension-runners/index.js
@@ -359,7 +359,11 @@ export function defaultReloadStrategy(
           setRawMode(stdin, true);
         } else if (keyPressed.name === 'r') {
           log.debug('Reloading installed extensions on user request');
-          extensionRunner.reloadAllExtensions();
+          extensionRunner.reloadAllExtensions()
+            .then(log.debug('Installed Extensions reloaded on user requesy'))
+            .catch(function(error) {
+              log.debug('Unable to reload installed extensions', error);
+            });
         }
       }