diff --git a/MBTiles/Shared/MBTileLayer.cs b/MBTiles/Shared/MBTileLayer.cs
index 9e2a5061..c988640b 100644
--- a/MBTiles/Shared/MBTileLayer.cs
+++ b/MBTiles/Shared/MBTileLayer.cs
@@ -1,5 +1,5 @@
-using System;
-using System.Diagnostics;
+using Microsoft.Extensions.Logging;
+using System;
 using System.Threading.Tasks;
 #if WPF
 using System.Windows;
@@ -87,7 +87,7 @@ namespace MapControl.MBTiles
                 }
                 catch (Exception ex)
                 {
-                    Debug.WriteLine($"{nameof(MBTileLayer)}: {ex.Message}");
+                    ImageLoader.LoggerFactory?.CreateLogger<MBTileLayer>()?.LogError(ex, "Invalid file: {file}", file);
                 }
             }
         }
diff --git a/MBTiles/Shared/MBTileSource.cs b/MBTiles/Shared/MBTileSource.cs
index 457f3882..f48fd545 100644
--- a/MBTiles/Shared/MBTileSource.cs
+++ b/MBTiles/Shared/MBTileSource.cs
@@ -1,7 +1,7 @@
-using System;
+using Microsoft.Extensions.Logging;
+using System;
 using System.Collections.Generic;
 using System.Data.SQLite;
-using System.Diagnostics;
 using System.IO;
 using System.Threading.Tasks;
 #if WPF
@@ -18,6 +18,9 @@ namespace MapControl.MBTiles
 {
     public sealed class MBTileSource : TileSource, IDisposable
     {
+        private static ILogger logger;
+        private static ILogger Logger => logger ?? (logger = ImageLoader.LoggerFactory?.CreateLogger<MBTileSource>());
+
         private SQLiteConnection connection;
 
         public IDictionary<string, string> Metadata { get; } = new Dictionary<string, string>();
@@ -75,7 +78,7 @@ namespace MapControl.MBTiles
             }
             catch (Exception ex)
             {
-                Debug.WriteLine($"{nameof(MBTileSource)}: {ex.Message}");
+                Logger?.LogError(ex, "LoadImageAsync");
             }
 
             return image;
diff --git a/MapControl/Shared/BingMapsTileLayer.cs b/MapControl/Shared/BingMapsTileLayer.cs
index 2833fc30..90526e66 100644
--- a/MapControl/Shared/BingMapsTileLayer.cs
+++ b/MapControl/Shared/BingMapsTileLayer.cs
@@ -55,12 +55,12 @@ namespace MapControl
                 }
                 catch (Exception ex)
                 {
-                    ImageLoader.LoggerFactory?.CreateLogger<BingMapsTileLayer>()?.LogError(ex, "{uri}", metadataUri);
+                    ImageLoader.LoggerFactory?.CreateLogger<BingMapsTileLayer>()?.LogError(ex, "Failed loading metadata from {uri}", metadataUri);
                 }
             }
             else
             {
-                ImageLoader.LoggerFactory?.CreateLogger<BingMapsTileLayer>()?.LogError("Bing Maps API Key required");
+                ImageLoader.LoggerFactory?.CreateLogger<BingMapsTileLayer>()?.LogError("Bing Maps API key required");
             }
         }
 
diff --git a/MapControl/Shared/GeoImage.cs b/MapControl/Shared/GeoImage.cs
index ad13f1a2..c3455f1a 100644
--- a/MapControl/Shared/GeoImage.cs
+++ b/MapControl/Shared/GeoImage.cs
@@ -113,7 +113,7 @@ namespace MapControl
                 }
                 catch (Exception ex)
                 {
-                    ImageLoader.LoggerFactory?.CreateLogger(typeof(GeoImage))?.LogError(ex, "{sourcePath}", sourcePath);
+                    ImageLoader.LoggerFactory?.CreateLogger(typeof(GeoImage))?.LogError(ex, "Failed loading from {path}", sourcePath);
                 }
             }
         }
diff --git a/MapControl/Shared/GroundOverlay.cs b/MapControl/Shared/GroundOverlay.cs
index 52113c05..00786493 100644
--- a/MapControl/Shared/GroundOverlay.cs
+++ b/MapControl/Shared/GroundOverlay.cs
@@ -80,7 +80,7 @@ namespace MapControl
                 }
                 catch (Exception ex)
                 {
-                    ImageLoader.LoggerFactory?.CreateLogger<GroundOverlay>()?.LogError(ex, "{sourcePath}", sourcePath);
+                    ImageLoader.LoggerFactory?.CreateLogger<GroundOverlay>()?.LogError(ex, "Failed loading from {path}", sourcePath);
                 }
             }
 
diff --git a/MapControl/Shared/ImageLoader.cs b/MapControl/Shared/ImageLoader.cs
index fab0aedc..69a60831 100644
--- a/MapControl/Shared/ImageLoader.cs
+++ b/MapControl/Shared/ImageLoader.cs
@@ -61,7 +61,7 @@ namespace MapControl
             }
             catch (Exception ex)
             {
-                Logger?.LogError(ex, "{uri}", uri);
+                Logger?.LogError(ex, "Failed loading image from {uri}", uri);
             }
 
             progress?.Report(1d);
@@ -128,7 +128,7 @@ namespace MapControl
             }
             catch (Exception ex)
             {
-                Logger?.LogError(ex, "{uri}", uri);
+                Logger?.LogError(ex, "Failed loading image from {uri}", uri);
             }
 
             return response;
diff --git a/MapControl/Shared/TileImageLoader.cs b/MapControl/Shared/TileImageLoader.cs
index 65e850b5..599b48dd 100644
--- a/MapControl/Shared/TileImageLoader.cs
+++ b/MapControl/Shared/TileImageLoader.cs
@@ -105,7 +105,7 @@ namespace MapControl
                             }
                             catch (Exception ex)
                             {
-                                Logger?.LogError(ex, "{zoom}/{column}/{row}", tile.ZoomLevel, tile.Column, tile.Row);
+                                Logger?.LogError(ex, "Failed loading tile image {zoom}/{column}/{row}", tile.ZoomLevel, tile.Column, tile.Row);
                             }
                         }
                     }
diff --git a/MapControl/Shared/WmsImageLayer.cs b/MapControl/Shared/WmsImageLayer.cs
index 43be953c..323f99de 100644
--- a/MapControl/Shared/WmsImageLayer.cs
+++ b/MapControl/Shared/WmsImageLayer.cs
@@ -117,7 +117,7 @@ namespace MapControl
                     }
                     catch (Exception ex)
                     {
-                        Logger?.LogError(ex, "{uri}", uri);
+                        Logger?.LogError(ex, "Failed reading capabilities from {uri}", uri);
                     }
                 }
             }
@@ -149,7 +149,7 @@ namespace MapControl
                     }
                     catch (Exception ex)
                     {
-                        Logger?.LogError(ex, "{uri}", uri);
+                        Logger?.LogError(ex, "Failed reading feature info from {uri}", uri);
                     }
                 }
             }
diff --git a/MapControl/Shared/WmtsTileLayer.cs b/MapControl/Shared/WmtsTileLayer.cs
index 6cd11028..3d8a7a51 100644
--- a/MapControl/Shared/WmtsTileLayer.cs
+++ b/MapControl/Shared/WmtsTileLayer.cs
@@ -200,7 +200,7 @@ namespace MapControl
                 }
                 catch (Exception ex)
                 {
-                    ImageLoader.LoggerFactory?.CreateLogger<WmtsTileLayer>()?.LogError(ex, "{uri}", CapabilitiesUri);
+                    ImageLoader.LoggerFactory?.CreateLogger<WmtsTileLayer>()?.LogError(ex, "Failed reading capabilities from {uri}", CapabilitiesUri);
                 }
             }
         }