diff --git a/app/src/processing/app/contrib/DetailPanel.java b/app/src/processing/app/contrib/DetailPanel.java
index 4cf327165..1df2f7a78 100644
--- a/app/src/processing/app/contrib/DetailPanel.java
+++ b/app/src/processing/app/contrib/DetailPanel.java
@@ -461,7 +461,7 @@ class DetailPanel extends JPanel {
     desc.append("</font> ");
 
     String version = contrib.getPrettyVersion();
-    if (version != null) {
+    if (version != null && !version.equals("null")) {
       desc.append(version);
     }
     desc.append(" <br/>");
diff --git a/app/src/processing/app/contrib/StatusPanel.java b/app/src/processing/app/contrib/StatusPanel.java
index 57d5ce5aa..93a8a3772 100644
--- a/app/src/processing/app/contrib/StatusPanel.java
+++ b/app/src/processing/app/contrib/StatusPanel.java
@@ -259,12 +259,24 @@ class StatusPanel extends JPanel {
 
     if (panel.getContrib().isCompatible(Base.getRevision())) {
       if (installButton.isEnabled()) {
-        updateLabel.setText(latestVersion + " available");
+        if (latestVersion != null) {
+          updateLabel.setText(latestVersion + " available");
+        } else {
+          updateLabel.setText("Available");
+        }
       } else {
-        updateLabel.setText(currentVersion + " installed");
+        if (currentVersion != null && !currentVersion.equals("null")) {
+          updateLabel.setText(currentVersion + " installed");
+        } else {
+          updateLabel.setText("Installed");
+        }
       }
     } else {
-      updateLabel.setText(currentVersion + " not compatible");
+      if (currentVersion != null && !currentVersion.equals("null")) {
+        updateLabel.setText(currentVersion + " not compatible");
+      } else {
+        updateLabel.setText("Not compatible");
+      }
     }
 
     if (latestVersion != null) {