Index: /trunk/src/org/openstreetmap/josm/gui/history/VersionInfoPanel.java
===================================================================
--- /trunk/src/org/openstreetmap/josm/gui/history/VersionInfoPanel.java	(revision 9679)
+++ /trunk/src/org/openstreetmap/josm/gui/history/VersionInfoPanel.java	(revision 9680)
@@ -200,6 +200,8 @@
     public void update(Observable o, Object arg) {
         HistoryOsmPrimitive primitive = getPrimitive();
-        Changeset cs = primitive.getChangeset();
-        update(cs, model.isLatest(primitive), primitive.getTimestamp(), primitive.getVersion());
+        if (primitive != null) {
+            Changeset cs = primitive.getChangeset();
+            update(cs, model.isLatest(primitive), primitive.getTimestamp(), primitive.getVersion());
+        }
     }
 
Index: /trunk/test/unit/org/openstreetmap/josm/gui/layer/TMSLayerTest.java
===================================================================
--- /trunk/test/unit/org/openstreetmap/josm/gui/layer/TMSLayerTest.java	(revision 9679)
+++ /trunk/test/unit/org/openstreetmap/josm/gui/layer/TMSLayerTest.java	(revision 9680)
@@ -49,6 +49,6 @@
 
     private static void test(ImageryType expected, TMSLayer layer) {
-        Main.main.addLayer(layer);
         try {
+            Main.main.addLayer(layer);
             assertEquals(expected, layer.getInfo().getImageryType());
         } finally {