diff --git a/android/src/main/java/org/ligi/passandroid/ui/quirk_fix/URLRewriteActivity.java b/android/src/main/java/org/ligi/passandroid/ui/quirk_fix/URLRewriteActivity.java
index b32dbefe..24d5df6e 100644
--- a/android/src/main/java/org/ligi/passandroid/ui/quirk_fix/URLRewriteActivity.java
+++ b/android/src/main/java/org/ligi/passandroid/ui/quirk_fix/URLRewriteActivity.java
@@ -16,7 +16,7 @@ public class URLRewriteActivity extends PassAndroidActivity {
         final Uri data = getIntent().getData();
         final String url = data != null ? new URLRewriteController(getTracker()).getUrlByUri(data) : null;
 
-        if (data != null && url == null) {
+        if ((data != null && url == null) || data == null) {
             new AlertDialog.Builder(this).setTitle("Workaround failed")
                     .setMessage(
                             "The URL PassAndroid tried to work around failed :-( some companies just send PassBooks to Apple Devices - this was an attempt to workaround this." +
diff --git a/android/src/main/java/org/ligi/passandroid/ui/quirk_fix/USAirwaysLoadActivity.kt b/android/src/main/java/org/ligi/passandroid/ui/quirk_fix/USAirwaysLoadActivity.kt
index 6219bb90..4a36dc5b 100644
--- a/android/src/main/java/org/ligi/passandroid/ui/quirk_fix/USAirwaysLoadActivity.kt
+++ b/android/src/main/java/org/ligi/passandroid/ui/quirk_fix/USAirwaysLoadActivity.kt
@@ -1,8 +1,10 @@
 package org.ligi.passandroid.ui.quirk_fix
 
+import android.content.DialogInterface
 import android.content.Intent
 import android.net.Uri
 import android.os.Bundle
+import androidx.appcompat.app.AlertDialog
 
 import org.ligi.passandroid.ui.PassAndroidActivity
 import org.ligi.passandroid.ui.PassImportActivity
@@ -13,12 +15,38 @@ class USAirwaysLoadActivity : PassAndroidActivity() {
         super.onCreate(savedInstanceState)
 
         val data = intent.data
-        val url = data?.toString()?.removeSuffix("/") ?: ""
+        if (data == null){
+            AlertDialog.Builder(this).setTitle("Workaround failed")
+                    .setMessage(
+                            "The URL PassAndroid tried to work around failed :-( some companies just send PassBooks to Apple Devices - this was an attempt to workaround this." + "Unfortunately it failed - perhaps there where changes on the serverside - you can open the site with your browser now - to see it in PassAndroid in future again it would help if you can send me the pass")
+                    .setPositiveButton("Browser") { dialog, which ->
+                        tracker.trackException("URLRewrite with invalid activity", false)
+                        val intent = Intent(this@USAirwaysLoadActivity, OpenIphoneWebView::class.java)
+                        intent.data = data
+                        startActivity(intent)
+                    }
+                    .setNeutralButton("send") { dialog, which ->
+                        val intent = Intent(Intent.ACTION_SEND)
+                        intent.putExtra(Intent.EXTRA_SUBJECT, "PassAndroid: URLRewrite Problem")
+                        intent.putExtra(Intent.EXTRA_EMAIL, arrayOf("ligi@ligi.de"))
+                        intent.putExtra(Intent.EXTRA_TEXT, data.toString())
+                        intent.type = "text/plain"
 
+                        startActivity(Intent.createChooser(intent, "How to send Link?"))
+                        finish()
+                    }
+                    .setNegativeButton("cancel") { dialog, which -> this@USAirwaysLoadActivity.finish() }
+                    .show()
+
+            return
+        }
+        val url = data?.toString()?.removeSuffix("/") ?: ""
         val split = url.split("/".toRegex()).dropLastWhile { it.isEmpty() }.toTypedArray()
 
+
         val passId = split[split.size - 2] + "/" + split[split.size - 1]
 
+
         val redirectUrl = "http://prod.wap.ncrwebhost.mobi/mobiqa/wap/$passId/passbook"
 
         tracker.trackEvent("quirk_fix", "redirect", "usairways", null)