diff --git a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/keyview/loader/KeyserverStatusLoader.java b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/keyview/loader/KeyserverStatusLoader.java
index cb6bd71ba..2ae535acf 100644
--- a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/keyview/loader/KeyserverStatusLoader.java
+++ b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/keyview/loader/KeyserverStatusLoader.java
@@ -68,9 +68,12 @@ public class KeyserverStatusLoader extends AsyncTaskLoader<KeyserverStatus> {
 
         try {
             if (cursor.moveToFirst()) {
+                if (cursor.isNull(INDEX_SEEN_ON_KEYSERVERS) || cursor.isNull(INDEX_LAST_UPDATED)) {
+                    return new KeyserverStatus(masterKeyId);
+                }
+
                 boolean isPublished = cursor.getInt(INDEX_SEEN_ON_KEYSERVERS) != 0;
-                Date lastUpdated = cursor.isNull(INDEX_LAST_UPDATED) ?
-                        null : new Date(cursor.getLong(INDEX_LAST_UPDATED) * 1000);
+                Date lastUpdated = new Date(cursor.getLong(INDEX_LAST_UPDATED) * 1000);
 
                 return new KeyserverStatus(masterKeyId, isPublished, lastUpdated);
             }
diff --git a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/keyview/view/KeyserverStatusView.java b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/keyview/view/KeyserverStatusView.java
index c6ab221bf..0d0e3491e 100644
--- a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/keyview/view/KeyserverStatusView.java
+++ b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/keyview/view/KeyserverStatusView.java
@@ -88,7 +88,7 @@ public class KeyserverStatusView extends FrameLayout implements KeyserverStatusM
     @Override
     public void setDisplayStatusUnknown() {
         setDisplayStatus(KeyserverDisplayStatus.UNKNOWN);
-        vSubtitle.setVisibility(View.GONE);
+        vSubtitle.setText(R.string.keyserver_last_updated_never);
     }
 
     @Override
diff --git a/OpenKeychain/src/main/res/values/strings.xml b/OpenKeychain/src/main/res/values/strings.xml
index 8b075b06e..680d27bac 100644
--- a/OpenKeychain/src/main/res/values/strings.xml
+++ b/OpenKeychain/src/main/res/values/strings.xml
@@ -1844,8 +1844,9 @@
 
     <string name="keyserver_title_published">"Published"</string>
     <string name="keyserver_title_not_published">"Not Published"</string>
-    <string name="keyserver_title_unknown">"Unknown"</string>
-    <string name="keyserver_last_updated">"Last updated: %s"</string>
+    <string name="keyserver_title_unknown">"Keyserver status: Unknown"</string>
+    <string name="keyserver_last_updated">"Last checked: %s"</string>
+    <string name="keyserver_last_updated_never">Last checked: Never</string>
 
     <string name="key_insecure_bitstrength_2048_problem">"This key uses the <b>%1$s</b> algorithm with a strength of <b>%2$s bits</b>. A secure key should have a strength of 2048 bits."</string>
     <string name="key_insecure_bitstrength_2048_solution">"This key can\'t be upgraded. For secure communication, the owner must generate a new key."</string>