1 files changed, 3 insertions, 0 deletions
diff --git a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/keyimport/KeybaseKeyserver.java b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/keyimport/KeybaseKeyserver.java
index 29ab06264..0ca6f07fd 100644
--- a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/keyimport/KeybaseKeyserver.java
+++ b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/keyimport/KeybaseKeyserver.java
@@ -42,6 +42,9 @@ public class KeybaseKeyserver extends Keyserver {
             // cut off "0x" if a user is searching for a key id
             query = query.substring(2);
         }
+        if (query.isEmpty()) {
+            throw new QueryTooShortException();
+        }
         mQuery = query;
 
         try {