1 files changed, 7 insertions, 1 deletions
diff --git a/app/src/main/java/app/fedilab/android/mastodon/activities/admin/AdminActionActivity.java b/app/src/main/java/app/fedilab/android/mastodon/activities/admin/AdminActionActivity.java
index 005af5d35..b84354b90 100644
--- a/app/src/main/java/app/fedilab/android/mastodon/activities/admin/AdminActionActivity.java
+++ b/app/src/main/java/app/fedilab/android/mastodon/activities/admin/AdminActionActivity.java
@@ -116,6 +116,8 @@ public class AdminActionActivity extends BaseBarActivity {
                         setTitle(R.string.administration);
                         invalidateOptionsMenu();
                     });
+                } else {
+                    finish();
                 }
             }
         });
@@ -340,7 +342,11 @@ public class AdminActionActivity extends BaseBarActivity {
     protected void onDestroy() {
         super.onDestroy();
         if (mReceiver != null) {
-            unregisterReceiver(mReceiver);
+            try {
+                unregisterReceiver(mReceiver);
+            } catch (IllegalArgumentException e) {
+                e.printStackTrace();
+            }
         }
     }