diff --git a/app/src/full/java/org/fdroid/fdroid/views/main/MainViewController.java b/app/src/full/java/org/fdroid/fdroid/views/main/MainViewController.java
index 447ec21f1..277f5d41d 100644
--- a/app/src/full/java/org/fdroid/fdroid/views/main/MainViewController.java
+++ b/app/src/full/java/org/fdroid/fdroid/views/main/MainViewController.java
@@ -60,8 +60,17 @@ class MainViewController extends RecyclerView.ViewHolder {
         new CategoriesViewBinder(activity, frame);
     }
 
+    /**
+     * {@link android.os.Environment#isExternalStorageRemovable()} sometimes
+     * throughs {@link IllegalArgumentException}s when it can't find the
+     * storage.
+     */
     public void bindSwapView() {
-        new NearbyViewBinder(activity, frame);
+        try {
+            new NearbyViewBinder(activity, frame);
+        } catch (IllegalArgumentException e) {
+            e.printStackTrace();
+        }
     }
 
     /**