diff --git a/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java b/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java
index 335f000..bb218ac 100644
--- a/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java
+++ b/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java
@@ -145,7 +145,7 @@ public class HistoryBrowserModel extends Observable implements LayerChangeListen
     protected boolean canShowAsLatest(OsmPrimitive primitive) {
         if (primitive == null) return false;
         if (primitive.isNew() || !primitive.isUsable()) return false;
-        
+
         //try creating a history primitive. if that fails, the primitive cannot be used.
         try {
             HistoryOsmPrimitive.forOsmPrimitive(primitive);
@@ -670,6 +670,8 @@ public class HistoryBrowserModel extends Observable implements LayerChangeListen
 
         @Override
         public int getRowCount() {
+            // Match the size of the opposite table so comparison is less confusing.
+            // (scroll bars lines up properly, etc.)
             int n = 0;
             if (current != null && current.getType().equals(OsmPrimitiveType.RELATION)) {
                 n = ((HistoryRelation)current).getNumMembers();
@@ -718,7 +720,7 @@ public class HistoryBrowserModel extends Observable implements LayerChangeListen
             HistoryRelation relation = getRelation();
             if (relation == null)
                 return null;
-            if (row >= relation.getNumMembers())
+            if (row >= relation.getNumMembers()) // see getRowCount
                 return null;
             return relation.getMembers().get(row);
         }
diff --git a/src/org/openstreetmap/josm/gui/history/NodeListTableCellRenderer.java b/src/org/openstreetmap/josm/gui/history/NodeListTableCellRenderer.java
index c8aae4e..b6aec9e 100644
--- a/src/org/openstreetmap/josm/gui/history/NodeListTableCellRenderer.java
+++ b/src/org/openstreetmap/josm/gui/history/NodeListTableCellRenderer.java
@@ -58,10 +58,9 @@ public class NodeListTableCellRenderer extends JLabel implements TableCellRender
         setBackground(bgColor);
     }
 
+    // Warning: The model pads with null-rows to match the size of the opposite table. 'value' could be null
     public Component getTableCellRendererComponent(JTable table, Object value, boolean isSelected, boolean hasFocus,
             int row, int column) {
-        if (value == null)
-            return this;
 
         HistoryBrowserModel.NodeListTableModel model = getNodeListTableModel(table);
         Long nodeId = (Long)value;
diff --git a/src/org/openstreetmap/josm/gui/history/RelationMemberListTableCellRenderer.java b/src/org/openstreetmap/josm/gui/history/RelationMemberListTableCellRenderer.java
index 2b9bebe..08c2e5f 100644
--- a/src/org/openstreetmap/josm/gui/history/RelationMemberListTableCellRenderer.java
+++ b/src/org/openstreetmap/josm/gui/history/RelationMemberListTableCellRenderer.java
@@ -91,10 +91,9 @@ public class RelationMemberListTableCellRenderer extends JLabel implements Table
         setBackground(bgColor);
     }
 
+    // Warning: The model pads with null-rows to match the size of the opposite table. 'value' could be null
     public Component getTableCellRendererComponent(JTable table, Object value, boolean isSelected, boolean hasFocus,
             int row, int column) {
-        if (value == null)
-            return this;
 
         HistoryBrowserModel.RelationMemberTableModel model = gteRelationMemberTableModel(table);
         RelationMember member = (RelationMember)value;