diff --git a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/securitytoken/SecurityTokenHelper.java b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/securitytoken/SecurityTokenHelper.java
index 61ed683e7..72baf7814 100644
--- a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/securitytoken/SecurityTokenHelper.java
+++ b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/securitytoken/SecurityTokenHelper.java
@@ -589,7 +589,7 @@ public class SecurityTokenHelper {
 
     public String getUrl() throws IOException {
         byte[] data = getData(0x5F, 0x50);
-        return new String(data);
+        return new String(data).trim();
     }
 
     public String getUserId() throws IOException {
diff --git a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/token/PublicKeyRetrievalLoader.java b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/token/PublicKeyRetrievalLoader.java
index 09694e0da..cce5412ca 100644
--- a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/token/PublicKeyRetrievalLoader.java
+++ b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/token/PublicKeyRetrievalLoader.java
@@ -29,6 +29,7 @@ import android.net.Uri;
 import android.os.SystemClock;
 import android.support.annotation.Nullable;
 import android.support.v4.content.AsyncTaskLoader;
+import android.text.TextUtils;
 import android.util.Log;
 
 import com.google.auto.value.AutoValue;
@@ -159,7 +160,7 @@ public abstract class PublicKeyRetrievalLoader extends AsyncTaskLoader<KeyRetrie
 
             try {
                 log.add(LogType.MSG_RET_URI_START, 0);
-                if (tokenUri == null) {
+                if (TextUtils.isEmpty(tokenUri)) {
                     log.add(LogType.MSG_RET_URI_NULL, 1);
                     return KeyRetrievalResult.createWithError(log);
                 }