Index: /applications/viewer/jmapviewer/pom.xml
===================================================================
--- /applications/viewer/jmapviewer/pom.xml	(revision 36380)
+++ /applications/viewer/jmapviewer/pom.xml	(revision 36381)
@@ -6,5 +6,5 @@
     <groupId>org.openstreetmap.jmapviewer</groupId>
     <artifactId>jmapviewer</artifactId>
-    <version>2.24-SNAPSHOT</version>
+    <version>2.25-SNAPSHOT</version>
 
     <name>JMapViewer</name>
Index: /applications/viewer/jmapviewer/src/org/openstreetmap/gui/jmapviewer/tilesources/BingAerialTileSource.java
===================================================================
--- /applications/viewer/jmapviewer/src/org/openstreetmap/gui/jmapviewer/tilesources/BingAerialTileSource.java	(revision 36380)
+++ /applications/viewer/jmapviewer/src/org/openstreetmap/gui/jmapviewer/tilesources/BingAerialTileSource.java	(revision 36381)
@@ -159,5 +159,7 @@
         if (API_KEY.equals(key)) { // If the API key has not been customized, we try to retrieve the API key
             try {
-                key = FeatureAdapter.retrieveApiKey(this.getId());
+                String rkey = FeatureAdapter.retrieveApiKey(this.getId());
+                if (rkey != null)
+                    key = rkey;
             } catch (IOException ioException) {
                 FeatureAdapter.getLogger(this.getClass()).log(Level.WARNING, "Failed to retrieve api key", ioException);