Index: trunk/src/org/openstreetmap/josm/gui/history/VersionTableCellRenderer.java
===================================================================
--- trunk/src/org/openstreetmap/josm/gui/history/VersionTableCellRenderer.java	(revision 2958)
+++ trunk/src/org/openstreetmap/josm/gui/history/VersionTableCellRenderer.java	(revision 2959)
@@ -135,5 +135,5 @@
 
     public void renderVersionFromHistory(HistoryOsmPrimitive primitive, JTable table, int row, boolean isSelected) {
-        renderIcon(primitive.getType());
+        renderIcon(primitive == null? null : primitive.getType());
         renderText(primitive);
         renderBackground(table, row, isSelected);