Index: /applications/viewer/jmapviewer/src/org/openstreetmap/gui/jmapviewer/tilesources/TemplatedTMSTileSource.java
===================================================================
--- /applications/viewer/jmapviewer/src/org/openstreetmap/gui/jmapviewer/tilesources/TemplatedTMSTileSource.java	(revision 35917)
+++ /applications/viewer/jmapviewer/src/org/openstreetmap/gui/jmapviewer/tilesources/TemplatedTMSTileSource.java	(revision 35918)
@@ -1,3 +1,3 @@
- // License: GPL. For details, see Readme.txt file.
+// License: GPL. For details, see Readme.txt file.
 package org.openstreetmap.gui.jmapviewer.tilesources;
 
@@ -102,5 +102,5 @@
                 try {
                     matcher.appendReplacement(output, FeatureAdapter.retrieveApiKey(imageryId));
-                } catch (IOException|NullPointerException e) {
+                } catch (IOException | RuntimeException e) {
                     throw new IllegalArgumentException(e);
                 }