Merge "Snap for 8554636 from aad056f69a3c44a860f6a08091d8b07a27491712 to sdk-release" into sdk-release
diff --git a/src/com/android/certinstaller/CertInstallerMain.java b/src/com/android/certinstaller/CertInstallerMain.java
index 17b5649..61f3000 100644
--- a/src/com/android/certinstaller/CertInstallerMain.java
+++ b/src/com/android/certinstaller/CertInstallerMain.java
@@ -204,7 +204,10 @@
 
         String target = MIME_MAPPINGS.get(mimeType);
         if (target == null) {
-            throw new IllegalArgumentException("Unknown MIME type: " + mimeType);
+            Log.e(TAG, "Unknown MIME type: " + mimeType + ". "
+                    + Log.getStackTraceString(new Throwable()));
+            Toast.makeText(this, R.string.invalid_certificate_title, Toast.LENGTH_LONG).show();
+            return;
         }
 
         if (WIFI_CONFIG.equals(target)) {