Index: /applications/editors/josm/plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java
===================================================================
--- /applications/editors/josm/plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java	(revision 5678)
+++ /applications/editors/josm/plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java	(revision 5679)
@@ -39,6 +39,5 @@
 {
 
-    ArrayList<HashMap<Integer, SlippyMapTile>> tileStorage = new ArrayList<HashMap<Integer, SlippyMapTile>>(
-                                                                   20);
+    ArrayList<HashMap<Integer, SlippyMapTile>> tileStorage = null;
 
     Point[][]                                  pixelpos    = new Point[21][21];
@@ -55,6 +54,6 @@
     {
         super("Slippy Map");
-        for (int i = 0; i < 18; i++)
-            tileStorage.add(new HashMap<Integer, SlippyMapTile>());
+
+        clearTileStorage();
 
         tileOptionMenu = new JPopupMenu();
@@ -146,4 +145,12 @@
     }
 
+    private void clearTileStorage()
+    {
+        tileStorage = new ArrayList<HashMap<Integer, SlippyMapTile>>(20);
+
+        for (int i = 0; i < 18; i++)
+            tileStorage.add(new HashMap<Integer, SlippyMapTile>());
+    }
+
     void loadAllTiles()
     {