Index: applications/viewer/jmapviewer/src/org/openstreetmap/gui/jmapviewer/tilesources/TemplatedTMSTileSource.java
===================================================================
--- applications/viewer/jmapviewer/src/org/openstreetmap/gui/jmapviewer/tilesources/TemplatedTMSTileSource.java	(revision 35912)
+++ applications/viewer/jmapviewer/src/org/openstreetmap/gui/jmapviewer/tilesources/TemplatedTMSTileSource.java	(revision 35913)
@@ -102,5 +102,5 @@
                 try {
                     matcher.appendReplacement(output, FeatureAdapter.retrieveApiKey(imageryId));
-                } catch (IOException e) {
+                } catch (IOException|NullPointerException e) {
                     throw new IllegalArgumentException(e);
                 }