diff --git a/app/src/main/java/org/torproject/android/OrbotMainActivity.java b/app/src/main/java/org/torproject/android/OrbotMainActivity.java
index 73df0f201..455bfa65b 100644
--- a/app/src/main/java/org/torproject/android/OrbotMainActivity.java
+++ b/app/src/main/java/org/torproject/android/OrbotMainActivity.java
@@ -6,6 +6,7 @@
 import android.annotation.SuppressLint;
 import android.app.AlertDialog;
 import android.app.Application;
+import android.content.ActivityNotFoundException;
 import android.content.BroadcastReceiver;
 import android.content.ContentUris;
 import android.content.ContentValues;
@@ -603,17 +604,22 @@ private void openBrowser(final String browserLaunchUrl, boolean forceExternal, S
 
     @SuppressWarnings("SameParameterValue")
     private void startIntent(String pkg, String action, Uri data) {
-        Intent i;
+
+        Intent i = new Intent();
         PackageManager pm = getPackageManager();
 
         try {
+            /**
+
             if (pkg != null) {
                 i = pm.getLaunchIntentForPackage(pkg);
                 if (i == null)
                     throw new PackageManager.NameNotFoundException();
             } else {
                 i = new Intent();
-            }
+            }**/
+
+            i.setPackage(pkg);
 
             i.setAction(action);
             i.setData(data);
@@ -621,7 +627,8 @@ private void startIntent(String pkg, String action, Uri data) {
             if (i.resolveActivity(pm) != null)
                 startActivity(i);
 
-        } catch (PackageManager.NameNotFoundException e) {
+        }
+        catch (Exception e) {
             // Should not occur. Ignore.
         }
     }