1 files changed, 3 insertions, 0 deletions
diff --git a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/helper/Preferences.java b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/helper/Preferences.java
index 5190a550e..0415baf64 100644
--- a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/helper/Preferences.java
+++ b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/helper/Preferences.java
@@ -215,6 +215,9 @@ public class Preferences {
             ListIterator<String> it = servers.listIterator();
             while (it.hasNext()) {
                 String server = it.next();
+                if (server == null) {
+                    continue;
+                }
                 if (server.equals("pool.sks-keyservers.net")) {
                     // use HKPS!
                     it.set("hkps://hkps.pool.sks-keyservers.net");