diff --git a/app/src/full/java/org/fdroid/fdroid/nearby/SwapWorkflowActivity.java b/app/src/full/java/org/fdroid/fdroid/nearby/SwapWorkflowActivity.java
index 27037f7fb..5f109682e 100644
--- a/app/src/full/java/org/fdroid/fdroid/nearby/SwapWorkflowActivity.java
+++ b/app/src/full/java/org/fdroid/fdroid/nearby/SwapWorkflowActivity.java
@@ -1196,7 +1196,11 @@ public class SwapWorkflowActivity extends AppCompatActivity {
                     peopleNearbyText.setVisibility(View.VISIBLE);
                     peopleNearbyProgress.setVisibility(View.GONE);
                 default:
-                    throw new IllegalArgumentException("Bad intent: " + intent);
+                    String msg = "Bad intent: " + intent + " " + bonjourStatus;
+                    Log.i(TAG, msg);
+                    if (BuildConfig.DEBUG) {
+                        throw new IllegalArgumentException(msg);
+                    }
             }
         }
     };