1 files changed, 6 insertions, 0 deletions

diff --git a/java/org/gnu/emacs/EmacsOpenActivity.java b/java/org/gnu/emacs/EmacsOpenActivity.java
index d27139e98bc..202b3c8c5dc 100644
--- a/java/org/gnu/emacs/EmacsOpenActivity.java
+++ b/java/org/gnu/emacs/EmacsOpenActivity.java
@@ -438,6 +438,12 @@ public final class EmacsOpenActivity extends Activity
 
         scheme = uri.getScheme ();
 
+        /* It is possible for scheme to be NULL, under Android 2.3 at
+           least.  */
+
+        if (scheme == null)
+          return;
+
         /* If URL is a mailto URI, call `message-mailto' much the same
            way emacsclient-mail.desktop does.  */