diff --git a/app-common/src/main/java/im/angry/openeuicc/ui/wizard/DownloadWizardMethodSelectFragment.kt b/app-common/src/main/java/im/angry/openeuicc/ui/wizard/DownloadWizardMethodSelectFragment.kt
index 4b02b7a..a73a586 100644
--- a/app-common/src/main/java/im/angry/openeuicc/ui/wizard/DownloadWizardMethodSelectFragment.kt
+++ b/app-common/src/main/java/im/angry/openeuicc/ui/wizard/DownloadWizardMethodSelectFragment.kt
@@ -126,7 +126,7 @@ class DownloadWizardMethodSelectFragment : DownloadWizardActivity.DownloadWizard
             state.matchingId = parsed.matchingId
             state.confirmationCodeRequired = parsed.confirmationCodeRequired
             gotoNextFragment(DownloadWizardDetailsFragment())
-        } catch (e: IllegalArgumentException) {
+        } catch (e: IllegalStateException) {
             AlertDialog.Builder(requireContext()).apply {
                 setTitle(R.string.profile_download_incorrect_lpa_string)
                 setMessage(R.string.profile_download_incorrect_lpa_string_message)
diff --git a/app-common/src/main/java/im/angry/openeuicc/util/LPAString.kt b/app-common/src/main/java/im/angry/openeuicc/util/LPAString.kt
index 20956fb..db5251d 100644
--- a/app-common/src/main/java/im/angry/openeuicc/util/LPAString.kt
+++ b/app-common/src/main/java/im/angry/openeuicc/util/LPAString.kt
@@ -8,15 +8,15 @@ data class LPAString(
 ) {
     companion object {
         fun parse(input: String): LPAString {
-            val components = input.removePrefix("LPA:").split('$')
-            if (components.size < 2 || components[0] != "1") {
-                throw IllegalArgumentException("Invalid activation code format")
-            }
+            var token = input
+            if (token.startsWith("LPA:", ignoreCase = true)) token = token.drop(4)
+            val components = token.split('$').map { it.trim().ifBlank { null } }
+            check(components.getOrNull(0) == "1") { "Invalid AC_Format" }
             return LPAString(
-                address = components[1].trim(),
-                matchingId = components.getOrNull(2)?.trim()?.ifBlank { null },
-                oid = components.getOrNull(3)?.trim()?.ifBlank { null },
-                confirmationCodeRequired = components.getOrNull(4)?.trim() == "1"
+                checkNotNull(components.getOrNull(1)) { "SM-DP+ is required" },
+                components.getOrNull(2),
+                components.getOrNull(3),
+                components.getOrNull(4) == "1"
             )
         }
     }