diff --git a/F-Droid/src/org/fdroid/fdroid/FDroid.java b/F-Droid/src/org/fdroid/fdroid/FDroid.java
index 25e8c2067..19e6a5c4a 100644
--- a/F-Droid/src/org/fdroid/fdroid/FDroid.java
+++ b/F-Droid/src/org/fdroid/fdroid/FDroid.java
@@ -172,13 +172,15 @@ public class FDroid extends ActionBarActivity {
             query = data.getSchemeSpecificPart();
         }
 
-        // an old format for querying via packageName
-        if (query.startsWith("pname:"))
-            appId = query.split(":")[1];
+        if (!TextUtils.isEmpty(query)) {
+            // an old format for querying via packageName
+            if (query.startsWith("pname:"))
+                appId = query.split(":")[1];
 
-        // sometimes, search URLs include pub: or other things before the query string
-        if (query.contains(":"))
-            query = query.split(":")[1];
+            // sometimes, search URLs include pub: or other things before the query string
+            if (query.contains(":"))
+                query = query.split(":")[1];
+        }
 
         Intent call = null;
         if (appId != null && appId.length() > 0) {