diff --git a/gui/src/main/groovy/com/muwire/gui/profile/PersonaOrProfileCellRenderer.groovy b/gui/src/main/groovy/com/muwire/gui/profile/PersonaOrProfileCellRenderer.groovy
index 38cb8f82..00b74b1d 100644
--- a/gui/src/main/groovy/com/muwire/gui/profile/PersonaOrProfileCellRenderer.groovy
+++ b/gui/src/main/groovy/com/muwire/gui/profile/PersonaOrProfileCellRenderer.groovy
@@ -22,6 +22,8 @@ class PersonaOrProfileCellRenderer 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: investiage how this can happen
         
         PersonaOrProfile pop = (PersonaOrProfile) value
         if (pop.getThumbnail() != null && settings.personaRendererAvatars)