diff --git a/src/micropolisj/build_tool/MakeTiles.java b/src/micropolisj/build_tool/MakeTiles.java
index 9ddc483..d6c84f9 100644
--- a/src/micropolisj/build_tool/MakeTiles.java
+++ b/src/micropolisj/build_tool/MakeTiles.java
@@ -116,12 +116,7 @@ public class MakeTiles
 			drawTo(ref.background, gr, destX, destY);
 		}
 
-		if (!loadedImages.containsKey(ref.fileName)) {
-			loadedImages.put(ref.fileName,
-				loadImage(ref.fileName));
-		}
-
-		SourceImage sourceImg = loadedImages.get(ref.fileName);
+		SourceImage sourceImg = loadImage(ref.fileName);
 
 		gr.drawImage(
 			sourceImg.image,
@@ -253,6 +248,17 @@ public class MakeTiles
 
 	static SourceImage loadImage(String fileName)
 		throws IOException
+	{
+		if (!loadedImages.containsKey(fileName)) {
+			loadedImages.put(fileName,
+				loadImageReal(fileName));
+		}
+
+		return loadedImages.get(fileName);
+	}
+
+	static SourceImage loadImageReal(String fileName)
+		throws IOException
 	{
 		File svgFile, pngFile = null;