Index: /trunk/src/org/openstreetmap/josm/data/imagery/ImageryInfo.java
===================================================================
--- /trunk/src/org/openstreetmap/josm/data/imagery/ImageryInfo.java	(revision 16571)
+++ /trunk/src/org/openstreetmap/josm/data/imagery/ImageryInfo.java	(revision 16572)
@@ -789,5 +789,5 @@
      */
     public ImageryType getImageryType() {
-        return super.getSourceType();
+        return super.getSourceType() != null ? super.getSourceType() : ImageryType.WMS.getDefault();
     }