Index: trunk/src/org/openstreetmap/josm/data/ImageData.java
===================================================================
--- trunk/src/org/openstreetmap/josm/data/ImageData.java	(revision 18049)
+++ trunk/src/org/openstreetmap/josm/data/ImageData.java	(revision 18050)
@@ -317,5 +317,5 @@
      * @param img the {@link ImageEntry} to remove
      * @param fireUpdateEvent if {@code true}, notifies listeners of image update
-     * @since xxx
+     * @since 18049
      */
     public void removeImage(ImageEntry img, boolean fireUpdateEvent) {
Index: trunk/src/org/openstreetmap/josm/data/osm/OsmUtils.java
===================================================================
--- trunk/src/org/openstreetmap/josm/data/osm/OsmUtils.java	(revision 18049)
+++ trunk/src/org/openstreetmap/josm/data/osm/OsmUtils.java	(revision 18050)
@@ -169,5 +169,6 @@
                 : null;
         if (p == null) {
-            throw new IllegalArgumentException("Expecting n/node/w/way/r/relation/area, but got '" + x[0] + '\'');
+            throw new IllegalArgumentException(
+                    "Expecting n/node/w/way/r/relation/area, but got '" + x[0] + "' for assertion '" + assertion + '\'');
         }
         if (x.length > 1) {
