diff --git a/Caches/FileDbCache/FileDbCache.cs b/Caches/FileDbCache/FileDbCache.cs
index 5fa64e57..eecdab1d 100644
--- a/Caches/FileDbCache/FileDbCache.cs
+++ b/Caches/FileDbCache/FileDbCache.cs
@@ -39,7 +39,7 @@ namespace MapControl.Caching
             try
             {
                 fileDb.Open(path);
-                Debug.WriteLine($"FileDbCache: Opened database {path}");
+                Debug.WriteLine($"{nameof(FileDbCache)}: Opened database {path}");
 
                 Clean();
             }
@@ -61,7 +61,7 @@ namespace MapControl.Caching
                     new Field(expiresField, DataTypeEnum.DateTime)
                 });
 
-                Debug.WriteLine($"FileDbCache: Created database {path}");
+                Debug.WriteLine($"{nameof(FileDbCache)}: Created database {path}");
             }
         }
 
@@ -94,7 +94,7 @@ namespace MapControl.Caching
             }
             catch (Exception ex)
             {
-                Debug.WriteLine($"FileDbCache.Get({key}): {ex.Message}");
+                Debug.WriteLine($"{nameof(FileDbCache)}.Get({key}): {ex.Message}");
             }
 
             return value;
@@ -143,7 +143,7 @@ namespace MapControl.Caching
             }
             catch (Exception ex)
             {
-                Debug.WriteLine($"FileDbCache.Set({key}): {ex.Message}");
+                Debug.WriteLine($"{nameof(FileDbCache)}.Set({key}): {ex.Message}");
             }
         }
 
@@ -161,7 +161,7 @@ namespace MapControl.Caching
             }
             catch (Exception ex)
             {
-                Debug.WriteLine($"FileDbCache.Remove({key}): {ex.Message}");
+                Debug.WriteLine($"{nameof(FileDbCache)}.Remove({key}): {ex.Message}");
             }
         }
 
@@ -171,7 +171,7 @@ namespace MapControl.Caching
 
             if (deleted > 0)
             {
-                Debug.WriteLine($"FileDbCache: Deleted {deleted} expired items");
+                Debug.WriteLine($"{nameof(FileDbCache)}: Deleted {deleted} expired items");
                 fileDb.Clean();
             }
         }
diff --git a/Caches/SQLiteCache/SQLiteCache.cs b/Caches/SQLiteCache/SQLiteCache.cs
index e78f38f9..5905dd31 100644
--- a/Caches/SQLiteCache/SQLiteCache.cs
+++ b/Caches/SQLiteCache/SQLiteCache.cs
@@ -40,7 +40,7 @@ namespace MapControl.Caching
                 command.ExecuteNonQuery();
             }
 
-            Debug.WriteLine($"SQLiteCache: Opened database {path}");
+            Debug.WriteLine($"{nameof(SQLiteCache)}: Opened database {path}");
 
             Clean();
         }
@@ -70,7 +70,7 @@ namespace MapControl.Caching
             }
             catch (Exception ex)
             {
-                Debug.WriteLine($"SQLiteCache.Get({key}): {ex.Message}");
+                Debug.WriteLine($"{nameof(SQLiteCache)}.Get({key}): {ex.Message}");
             }
 
             return value;
@@ -96,7 +96,7 @@ namespace MapControl.Caching
             }
             catch (Exception ex)
             {
-                Debug.WriteLine($"SQLiteCache.GetAsync({key}): {ex.Message}");
+                Debug.WriteLine($"{nameof(SQLiteCache)}.GetAsync({key}): {ex.Message}");
             }
 
             return value;
@@ -115,7 +115,7 @@ namespace MapControl.Caching
             }
             catch (Exception ex)
             {
-                Debug.WriteLine($"SQLiteCache.Set({key}): {ex.Message}");
+                Debug.WriteLine($"{nameof(SQLiteCache)}.Set({key}): {ex.Message}");
             }
         }
 
@@ -132,7 +132,7 @@ namespace MapControl.Caching
             }
             catch (Exception ex)
             {
-                Debug.WriteLine($"SQLiteCache.SetAsync({key}): {ex.Message}");
+                Debug.WriteLine($"{nameof(SQLiteCache)}.SetAsync({key}): {ex.Message}");
             }
         }
 
@@ -158,7 +158,7 @@ namespace MapControl.Caching
             }
             catch (Exception ex)
             {
-                Debug.WriteLine($"SQLiteCache.Remove({key}): {ex.Message}");
+                Debug.WriteLine($"{nameof(SQLiteCache)}.Remove({key}): {ex.Message}");
             }
         }
 
@@ -175,7 +175,7 @@ namespace MapControl.Caching
             }
             catch (Exception ex)
             {
-                Debug.WriteLine($"SQLiteCache.RemoveAsync({key}): {ex.Message}");
+                Debug.WriteLine($"{nameof(SQLiteCache)}.RemoveAsync({key}): {ex.Message}");
             }
         }
 
@@ -192,7 +192,7 @@ namespace MapControl.Caching
                 var deleted = (long)command.ExecuteScalar();
                 if (deleted > 0)
                 {
-                    Debug.WriteLine($"SQLiteCache: Deleted {deleted} expired items");
+                    Debug.WriteLine($"{nameof(SQLiteCache)}: Deleted {deleted} expired items");
                 }
             }
 #endif
@@ -211,7 +211,7 @@ namespace MapControl.Caching
                 var deleted = (long)await command.ExecuteScalarAsync();
                 if (deleted > 0)
                 {
-                    Debug.WriteLine($"SQLiteCache: Deleted {deleted} expired items");
+                    Debug.WriteLine($"{nameof(SQLiteCache)}: Deleted {deleted} expired items");
                 }
             }
 #endif
diff --git a/MBTiles/Shared/MBTileLayer.cs b/MBTiles/Shared/MBTileLayer.cs
index 309bd139..0cbf439c 100644
--- a/MBTiles/Shared/MBTileLayer.cs
+++ b/MBTiles/Shared/MBTileLayer.cs
@@ -91,7 +91,7 @@ namespace MapControl.MBTiles
                 }
                 catch (Exception ex)
                 {
-                    Debug.WriteLine($"MBTileLayer: {ex.Message}");
+                    Debug.WriteLine($"{nameof(MBTileLayer)}: {ex.Message}");
                 }
             }
         }
diff --git a/MBTiles/Shared/MBTileSource.cs b/MBTiles/Shared/MBTileSource.cs
index 06b663e4..4120cf3f 100644
--- a/MBTiles/Shared/MBTileSource.cs
+++ b/MBTiles/Shared/MBTileSource.cs
@@ -106,7 +106,7 @@ namespace MapControl.MBTiles
             }
             catch (Exception ex)
             {
-                Debug.WriteLine($"MBTileSource: {ex.Message}");
+                Debug.WriteLine($"{nameof(MBTileSource)}: {ex.Message}");
             }
 
             return image;
diff --git a/MapControl/Shared/BingMapsTileLayer.cs b/MapControl/Shared/BingMapsTileLayer.cs
index b7334dd4..39733530 100644
--- a/MapControl/Shared/BingMapsTileLayer.cs
+++ b/MapControl/Shared/BingMapsTileLayer.cs
@@ -59,12 +59,12 @@ namespace MapControl
                 }
                 catch (Exception ex)
                 {
-                    Debug.WriteLine($"BingMapsTileLayer: {metadataUri}: {ex.Message}");
+                    Debug.WriteLine($"{nameof(BingMapsTileLayer)}: {metadataUri}: {ex.Message}");
                 }
             }
             else
             {
-                Debug.WriteLine("BingMapsTileLayer requires a Bing Maps API Key");
+                Debug.WriteLine($"{nameof(BingMapsTileLayer)} requires a Bing Maps API Key");
             }
         }
 
diff --git a/MapControl/Shared/GeoImage.cs b/MapControl/Shared/GeoImage.cs
index 12fea118..1ae964e4 100644
--- a/MapControl/Shared/GeoImage.cs
+++ b/MapControl/Shared/GeoImage.cs
@@ -65,7 +65,7 @@ namespace MapControl
                 }
                 catch (Exception ex)
                 {
-                    Debug.WriteLine($"GeoImage: {ex.Message}");
+                    Debug.WriteLine($"{nameof(GeoImage)}: {sourcePath}: {ex.Message}");
                 }
             }
         }
@@ -138,13 +138,11 @@ namespace MapControl
 
         private static async Task<GeoBitmap> ReadWorldFileImageAsync(string sourcePath, string worldFilePath)
         {
-            var geoBitmap = new GeoBitmap();
-
-            geoBitmap.Bitmap = (BitmapSource)await ImageLoader.LoadImageAsync(sourcePath);
-
-            geoBitmap.Transform = await Task.Run(() => ReadWorldFileMatrix(worldFilePath));
-
-            return geoBitmap;
+            return new GeoBitmap
+            {
+                Bitmap = (BitmapSource)await ImageLoader.LoadImageAsync(sourcePath),
+                Transform = await Task.Run(() => ReadWorldFileMatrix(worldFilePath))
+            };
         }
 
         private static Matrix ReadWorldFileMatrix(string worldFilePath)
@@ -170,7 +168,7 @@ namespace MapControl
                 parameters[5]); // line 6: F or OffsetY
         }
 
-        private static MapProjection GetProjection(string sourcePath, short[] geoKeyDirectory)
+        private static MapProjection GetProjection(short[] geoKeyDirectory)
         {
             MapProjection projection = null;
 
@@ -181,7 +179,7 @@ namespace MapControl
                     int epsgCode = geoKeyDirectory[i + 3];
 
                     projection = MapProjectionFactory.Instance.GetProjection(epsgCode) ??
-                        throw new ArgumentException($"Can not create projection EPSG:{epsgCode} in {sourcePath}.");
+                        throw new ArgumentException($"Can not create projection EPSG:{epsgCode}.");
 
                     break;
                 }
diff --git a/MapControl/Shared/GroundOverlay.cs b/MapControl/Shared/GroundOverlay.cs
index 85b95dc0..7647cc1b 100644
--- a/MapControl/Shared/GroundOverlay.cs
+++ b/MapControl/Shared/GroundOverlay.cs
@@ -86,7 +86,7 @@ namespace MapControl
                 }
                 catch (Exception ex)
                 {
-                    Debug.WriteLine($"GroundOverlayPanel: {sourcePath}: {ex.Message}");
+                    Debug.WriteLine($"{nameof(GroundOverlay)}: {sourcePath}: {ex.Message}");
                 }
             }
 
diff --git a/MapControl/Shared/ImageFileCache.cs b/MapControl/Shared/ImageFileCache.cs
index cdebac45..664127b6 100644
--- a/MapControl/Shared/ImageFileCache.cs
+++ b/MapControl/Shared/ImageFileCache.cs
@@ -34,7 +34,7 @@ namespace MapControl.Caching
 
             rootPath = path;
 
-            Debug.WriteLine($"ImageFileCache: {rootPath}");
+            Debug.WriteLine($"{nameof(ImageFileCache)}: {rootPath}");
 
             ThreadPool.QueueUserWorkItem(o => Clean());
         }
@@ -61,7 +61,7 @@ namespace MapControl.Caching
                 }
                 catch (Exception ex)
                 {
-                    Debug.WriteLine($"ImageFileCache: Failed reading {path}: {ex.Message}");
+                    Debug.WriteLine($"{nameof(ImageFileCache)}: Failed reading {path}: {ex.Message}");
                 }
             }
 
@@ -101,7 +101,7 @@ namespace MapControl.Caching
                 }
                 catch (Exception ex)
                 {
-                    Debug.WriteLine($"ImageFileCache: Failed reading {path}: {ex.Message}");
+                    Debug.WriteLine($"{nameof(ImageFileCache)}: Failed reading {path}: {ex.Message}");
                 }
             }
 
@@ -134,7 +134,7 @@ namespace MapControl.Caching
                 }
                 catch (Exception ex)
                 {
-                    Debug.WriteLine($"ImageFileCache: Failed writing {path}: {ex.Message}");
+                    Debug.WriteLine($"{nameof(ImageFileCache)}: Failed writing {path}: {ex.Message}");
                 }
             }
         }
@@ -166,7 +166,7 @@ namespace MapControl.Caching
             }
             catch (Exception ex)
             {
-                Debug.WriteLine($"ImageFileCache: Failed writing {path}: {ex.Message}");
+                Debug.WriteLine($"{nameof(ImageFileCache)}: Failed writing {path}: {ex.Message}");
             }
         }
 
@@ -195,7 +195,7 @@ namespace MapControl.Caching
             }
             catch (Exception ex)
             {
-                Debug.WriteLine($"ImageFileCache: Failed deleting {path}: {ex.Message}");
+                Debug.WriteLine($"{nameof(ImageFileCache)}: Failed deleting {path}: {ex.Message}");
             }
         }
 
@@ -214,7 +214,7 @@ namespace MapControl.Caching
             }
             catch (Exception ex)
             {
-                Debug.WriteLine($"ImageFileCache: Failed deleting {path}: {ex.Message}");
+                Debug.WriteLine($"{nameof(ImageFileCache)}: Failed deleting {path}: {ex.Message}");
             }
         }
 
@@ -224,7 +224,7 @@ namespace MapControl.Caching
 
             if (deletedFileCount > 0)
             {
-                Debug.WriteLine($"ImageFileCache: Deleted {deletedFileCount} expired files.");
+                Debug.WriteLine($"{nameof(ImageFileCache)}: Deleted {deletedFileCount} expired files.");
             }
         }
 
@@ -241,7 +241,7 @@ namespace MapControl.Caching
             }
             catch (Exception ex)
             {
-                Debug.WriteLine($"ImageFileCache: Invalid key {key}: {ex.Message}");
+                Debug.WriteLine($"{nameof(ImageFileCache)}: Invalid key {key}: {ex.Message}");
             }
 
             return null;
@@ -264,7 +264,7 @@ namespace MapControl.Caching
             }
             catch (Exception ex)
             {
-                Debug.WriteLine($"ImageFileCache: Failed cleaning {directory.FullName}: {ex.Message}");
+                Debug.WriteLine($"{nameof(ImageFileCache)}: Failed cleaning {directory.FullName}: {ex.Message}");
             }
 
             return deletedFileCount;
@@ -299,7 +299,7 @@ namespace MapControl.Caching
                 }
                 catch (Exception ex)
                 {
-                    Debug.WriteLine($"ImageFileCache: Failed cleaning {file.FullName}: {ex.Message}");
+                    Debug.WriteLine($"{nameof(ImageFileCache)}: Failed cleaning {file.FullName}: {ex.Message}");
                 }
             }
 
diff --git a/MapControl/Shared/ImageLoader.cs b/MapControl/Shared/ImageLoader.cs
index bd23908b..d65a5935 100644
--- a/MapControl/Shared/ImageLoader.cs
+++ b/MapControl/Shared/ImageLoader.cs
@@ -60,7 +60,7 @@ namespace MapControl
             }
             catch (Exception ex)
             {
-                Debug.WriteLine($"ImageLoader: {uri}: {ex.Message}");
+                Debug.WriteLine($"{nameof(ImageLoader)}: {uri}: {ex.Message}");
             }
 
             progress?.Report(1d);
@@ -121,13 +121,13 @@ namespace MapControl
                     }
                     else
                     {
-                        Debug.WriteLine($"ImageLoader: {uri}: {(int)responseMessage.StatusCode} {responseMessage.ReasonPhrase}");
+                        Debug.WriteLine($"{nameof(ImageLoader)}: {uri}: {(int)responseMessage.StatusCode} {responseMessage.ReasonPhrase}");
                     }
                 }
             }
             catch (Exception ex)
             {
-                Debug.WriteLine($"ImageLoader: {uri}: {ex.Message}");
+                Debug.WriteLine($"{nameof(ImageLoader)}: {uri}: {ex.Message}");
             }
 
             return response;
diff --git a/MapControl/Shared/MapImageLayer.cs b/MapControl/Shared/MapImageLayer.cs
index d32a5db6..5e195f8b 100644
--- a/MapControl/Shared/MapImageLayer.cs
+++ b/MapControl/Shared/MapImageLayer.cs
@@ -195,7 +195,7 @@ namespace MapControl
                     }
                     catch (Exception ex)
                     {
-                        Debug.WriteLine($"MapImageLayer: {ex.Message}");
+                        Debug.WriteLine($"{nameof(MapImageLayer)}: {ex.Message}");
                     }
                 }
 
diff --git a/MapControl/Shared/MapOverlaysPanel.cs b/MapControl/Shared/MapOverlaysPanel.cs
index 26edbb6a..1905cfd9 100644
--- a/MapControl/Shared/MapOverlaysPanel.cs
+++ b/MapControl/Shared/MapOverlaysPanel.cs
@@ -123,7 +123,7 @@ namespace MapControl
             }
             catch (Exception ex)
             {
-                Debug.WriteLine($"MapOverlaysControl: {sourcePath}: {ex.Message}");
+                Debug.WriteLine($"{nameof(MapOverlaysPanel)}: {sourcePath}: {ex.Message}");
 
                 overlay = new MapPanel();
             }
diff --git a/MapControl/Shared/MapPanel.cs b/MapControl/Shared/MapPanel.cs
index 8cd67b0c..40ebae9c 100644
--- a/MapControl/Shared/MapPanel.cs
+++ b/MapControl/Shared/MapPanel.cs
@@ -179,7 +179,7 @@ namespace MapControl
                     }
                     catch (Exception ex)
                     {
-                        Debug.WriteLine($"MapPanel.ArrangeOverride: {element}: {ex.Message}");
+                        Debug.WriteLine($"{nameof(MapPanel)}.{nameof(ArrangeOverride)}: {element}: {ex.Message}");
                     }
                 }
             }
diff --git a/MapControl/Shared/TileImageLoader.cs b/MapControl/Shared/TileImageLoader.cs
index 64339013..721355f6 100644
--- a/MapControl/Shared/TileImageLoader.cs
+++ b/MapControl/Shared/TileImageLoader.cs
@@ -127,7 +127,7 @@ namespace MapControl
             }
             catch (Exception ex)
             {
-                Debug.WriteLine($"TileImageLoader: {tile.ZoomLevel}/{tile.Column}/{tile.Row}: {ex.Message}");
+                Debug.WriteLine($"{nameof(TileImageLoader)}: {tile.ZoomLevel}/{tile.Column}/{tile.Row}: {ex.Message}");
             }
         }
 
@@ -170,7 +170,7 @@ namespace MapControl
             }
             catch (Exception ex)
             {
-                Debug.WriteLine($"TileImageLoader.Cache.GetAsync: {cacheKey}: {ex.Message}");
+                Debug.WriteLine($"{nameof(TileImageLoader)}.{nameof(Cache)}.{nameof(Cache.GetAsync)}: {cacheKey}: {ex.Message}");
 
                 return null;
             }
@@ -195,7 +195,7 @@ namespace MapControl
             }
             catch (Exception ex)
             {
-                Debug.WriteLine($"TileImageLoader.Cache.SetAsync: {cacheKey}: {ex.Message}");
+                Debug.WriteLine($"{nameof(TileImageLoader)}.{nameof(Cache)}.{nameof(Cache.SetAsync)}: {cacheKey}: {ex.Message}");
             }
         }
     }
diff --git a/MapControl/Shared/WmsImageLayer.cs b/MapControl/Shared/WmsImageLayer.cs
index a97d58ef..88d55f86 100644
--- a/MapControl/Shared/WmsImageLayer.cs
+++ b/MapControl/Shared/WmsImageLayer.cs
@@ -117,7 +117,7 @@ namespace MapControl
                     }
                     catch (Exception ex)
                     {
-                        Debug.WriteLine($"WmsImageLayer: {uri}: {ex.Message}");
+                        Debug.WriteLine($"{nameof(WmsImageLayer)}: {uri}: {ex.Message}");
                     }
                 }
             }
@@ -147,7 +147,7 @@ namespace MapControl
                     }
                     catch (Exception ex)
                     {
-                        Debug.WriteLine($"WmsImageLayer: {uri}: {ex.Message}");
+                        Debug.WriteLine($"{nameof(WmsImageLayer)}: {uri}: {ex.Message}");
                     }
                 }
             }
@@ -334,7 +334,7 @@ namespace MapControl
                 }
                 catch (Exception ex)
                 {
-                    Debug.WriteLine($"WmsImageLayer: {uri}: {ex.Message}");
+                    Debug.WriteLine($"{nameof(WmsImageLayer)}: {uri}: {ex.Message}");
                 }
             }
 
diff --git a/MapControl/Shared/WmtsTileLayer.cs b/MapControl/Shared/WmtsTileLayer.cs
index effae479..6a74d3e7 100644
--- a/MapControl/Shared/WmtsTileLayer.cs
+++ b/MapControl/Shared/WmtsTileLayer.cs
@@ -210,7 +210,7 @@ namespace MapControl
                 }
                 catch (Exception ex)
                 {
-                    Debug.WriteLine($"WmtsTileLayer: {CapabilitiesUri}: {ex.Message}");
+                    Debug.WriteLine($"{nameof(WmtsTileLayer)}: {CapabilitiesUri}: {ex.Message}");
                 }
             }
         }
diff --git a/MapControl/UWP/ImageFileCache.UWP.cs b/MapControl/UWP/ImageFileCache.UWP.cs
index 5c50fe8f..20b8e7fa 100644
--- a/MapControl/UWP/ImageFileCache.UWP.cs
+++ b/MapControl/UWP/ImageFileCache.UWP.cs
@@ -32,7 +32,7 @@ namespace MapControl.Caching
         {
             rootFolder = folder ?? throw new ArgumentException($"The {nameof(folder)} argument must not be null or empty.", nameof(folder));
 
-            Debug.WriteLine($"ImageFileCache: {rootFolder.Path}");
+            Debug.WriteLine($"{nameof(ImageFileCache)}: {rootFolder.Path}");
 
             _ = Task.Factory.StartNew(CleanAsync, TaskCreationOptions.LongRunning);
         }
@@ -89,7 +89,7 @@ namespace MapControl.Caching
                 }
                 catch (Exception ex)
                 {
-                    Debug.WriteLine($"ImageFileCache: Failed reading {key}: {ex.Message}");
+                    Debug.WriteLine($"{nameof(ImageFileCache)}: Failed reading {key}: {ex.Message}");
                 }
             }
 
@@ -126,7 +126,7 @@ namespace MapControl.Caching
                 }
                 catch (Exception ex)
                 {
-                    Debug.WriteLine($"ImageFileCache: Failed writing {key}: {ex.Message}");
+                    Debug.WriteLine($"{nameof(ImageFileCache)}: Failed writing {key}: {ex.Message}");
                 }
             }
         }
@@ -137,7 +137,7 @@ namespace MapControl.Caching
 
             if (deletedFileCount > 0)
             {
-                Debug.WriteLine($"ImageFileCache: Deleted {deletedFileCount} expired files.");
+                Debug.WriteLine($"{nameof(ImageFileCache)}: Deleted {deletedFileCount} expired files.");
             }
         }
 
@@ -164,7 +164,7 @@ namespace MapControl.Caching
             }
             catch (Exception ex)
             {
-                Debug.WriteLine($"ImageFileCache: Failed cleaning {folder.Path}: {ex.Message}");
+                Debug.WriteLine($"{nameof(ImageFileCache)}: Failed cleaning {folder.Path}: {ex.Message}");
             }
 
             return deletedFileCount;
@@ -200,7 +200,7 @@ namespace MapControl.Caching
                 }
                 catch (Exception ex)
                 {
-                    Debug.WriteLine($"ImageFileCache: Failed cleaning {file.Path}: {ex.Message}");
+                    Debug.WriteLine($"{nameof(ImageFileCache)}: Failed cleaning {file.Path}: {ex.Message}");
                 }
             }
 
diff --git a/MapControl/WPF/GeoImage.WPF.cs b/MapControl/WPF/GeoImage.WPF.cs
index ee2364ba..0b7260b8 100644
--- a/MapControl/WPF/GeoImage.WPF.cs
+++ b/MapControl/WPF/GeoImage.WPF.cs
@@ -13,9 +13,9 @@ namespace MapControl
 {
     public partial class GeoImage
     {
-        private static async Task<GeoBitmap> ReadGeoTiffAsync(string sourcePath)
+        private static Task<GeoBitmap> ReadGeoTiffAsync(string sourcePath)
         {
-            return await Task.Run(() =>
+            return Task.Run(() =>
             {
                 var geoBitmap = new GeoBitmap();
 
@@ -42,12 +42,12 @@ namespace MapControl
                 }
                 else
                 {
-                    throw new ArgumentException($"No coordinate transformation found in {sourcePath}.");
+                    throw new ArgumentException("No coordinate transformation found.");
                 }
 
                 if (metadata.GetQuery(QueryString(GeoKeyDirectoryTag)) is short[] geoKeyDirectory)
                 {
-                    geoBitmap.Projection = GetProjection(sourcePath, geoKeyDirectory);
+                    geoBitmap.Projection = GetProjection(geoKeyDirectory);
                 }
 
                 if (metadata.GetQuery(QueryString(NoDataTag)) is string noData &&
diff --git a/MapControl/WinUI/GeoImage.WinUI.cs b/MapControl/WinUI/GeoImage.WinUI.cs
index bfe9d7be..32419795 100644
--- a/MapControl/WinUI/GeoImage.WinUI.cs
+++ b/MapControl/WinUI/GeoImage.WinUI.cs
@@ -54,13 +54,13 @@ namespace MapControl
                 }
                 else
                 {
-                    throw new ArgumentException($"No coordinate transformation found in {sourcePath}.");
+                    throw new ArgumentException("No coordinate transformation found.");
                 }
 
                 if (metadata.TryGetValue(geoKeyDirectoryQuery, out BitmapTypedValue geoKeyDirValue) &&
                     geoKeyDirValue.Value is short[] geoKeyDirectory)
                 {
-                    geoBitmap.Projection = GetProjection(sourcePath, geoKeyDirectory);
+                    geoBitmap.Projection = GetProjection(geoKeyDirectory);
                 }
 
                 return geoBitmap;