diff --git a/gui/src/main/groovy/com/muwire/gui/TrustCellRenderer.groovy b/gui/src/main/groovy/com/muwire/gui/TrustCellRenderer.groovy
index 7f95b3bd9..35f5c6c63 100644
--- a/gui/src/main/groovy/com/muwire/gui/TrustCellRenderer.groovy
+++ b/gui/src/main/groovy/com/muwire/gui/TrustCellRenderer.groovy
@@ -24,6 +24,9 @@ class TrustCellRenderer extends DefaultTableCellRenderer {
     Component getTableCellRendererComponent(JTable table, Object value,
                                             boolean isSelected, boolean hasFocus, int row, int column) {
         super.getTableCellRendererComponent(table, value, isSelected, hasFocus, row, column)
+        
+        if (value == null)
+            return this // TODO: investigate
 
         TrustLevel level = (TrustLevel) value
         switch(value) {