diff --git a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/SecurityTokenOperationActivity.java b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/SecurityTokenOperationActivity.java
index b767f2465..de4db520f 100644
--- a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/SecurityTokenOperationActivity.java
+++ b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/SecurityTokenOperationActivity.java
@@ -331,12 +331,18 @@ public class SecurityTokenOperationActivity extends BaseSecurityTokenActivity {
                 protected Void doInBackground(Void... params) {
                     // check all 200ms if Security Token has been taken away
                     while (true) {
-                        if (stConnection.isConnected()) {
-                            try {
+                        try {
+                            if (stConnection.isConnected()) {
                                 Thread.sleep(200);
-                            } catch (InterruptedException ignored) {
+                            } else {
+                                return null;
                             }
-                        } else {
+                        } catch (InterruptedException ignored) {
+                            // Sleep interrupted; ignore
+                        } catch (SecurityException ignored) {
+                            // In newer version of Android, isConnected() can throw an SecurityException
+                            // when the Tag object becomes "stale"; this simply means the tag has been removed
+                            // (and possibly rediscovered), so we can safely break from here.
                             return null;
                         }
                     }
diff --git a/OpenKeychain/src/test/java/org/sufficientlysecure/keychain/pgp/SplitUserIdTest.java b/OpenKeychain/src/test/java/org/sufficientlysecure/keychain/pgp/SplitUserIdTest.java
index 8f8ca1337..335be9825 100644
--- a/OpenKeychain/src/test/java/org/sufficientlysecure/keychain/pgp/SplitUserIdTest.java
+++ b/OpenKeychain/src/test/java/org/sufficientlysecure/keychain/pgp/SplitUserIdTest.java
@@ -130,4 +130,12 @@ public class SplitUserIdTest {
         Assert.assertEquals("this is a comment", info.comment);
     }
 
-}
\ No newline at end of file
+    @Test
+    public void splitUserIdWithEmailWithoutTldShouldReturnNameAndEmail() {
+        OpenPgpUtils.UserId info = KeyRing.splitUserId("Max Mustermann <max@localhost>");
+        Assert.assertEquals("Max Mustermann", info.name);
+        Assert.assertEquals("max@localhost", info.email);
+        Assert.assertNull(info.comment);
+    }
+
+}
diff --git a/README.md b/README.md
index 86fac8808..9f7809e3e 100644
--- a/README.md
+++ b/README.md
@@ -1,3 +1,7 @@
+**WARNING: This software is no longer actively developed.**
+We will still apply security fixes where reported, and do basic maintenance work, but no new features or will be worked on.
+We will try to consider and merge contributions where possible.
+
 # OpenKeychain (for Android)
 
 OpenKeychain is an OpenPGP implementation for Android.