Index: /trunk/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java
===================================================================
--- /trunk/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java	(revision 9732)
+++ /trunk/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java	(revision 9733)
@@ -743,5 +743,5 @@
         OsmDataLayer l = (OsmDataLayer) newLayer;
         l.data.addDataSetListener(this);
-        OsmPrimitive primitive = l.data.getPrimitiveById(history.getId(), history.getType());
+        OsmPrimitive primitive = history != null ? l.data.getPrimitiveById(history.getId(), history.getType()) : null;
         HistoryOsmPrimitive latest;
         if (canShowAsLatest(primitive)) {