diff --git a/MBTiles/Shared/MBTileSource.cs b/MBTiles/Shared/MBTileSource.cs
index 65062dcd..23fd9bb2 100644
--- a/MBTiles/Shared/MBTileSource.cs
+++ b/MBTiles/Shared/MBTileSource.cs
@@ -2,7 +2,6 @@
 using System;
 using System.Collections.Generic;
 using System.Data.SQLite;
-using System.IO;
 using System.Threading.Tasks;
 #if WPF
 using System.Windows.Media;
@@ -73,7 +72,7 @@ namespace MapControl.MBTiles
 
                     var buffer = (byte[])await command.ExecuteScalarAsync();
 
-                    if (buffer != null && buffer.Length > 0)
+                    if (buffer?.Length > 0)
                     {
                         image = await LoadImageAsync(buffer);
                     }
diff --git a/MapControl/Shared/TileImageLoader.cs b/MapControl/Shared/TileImageLoader.cs
index 24d63a3a..3171b618 100644
--- a/MapControl/Shared/TileImageLoader.cs
+++ b/MapControl/Shared/TileImageLoader.cs
@@ -173,7 +173,7 @@ namespace MapControl
                 {
                     var buffer = await LoadCachedBuffer(tile, uri, cacheName).ConfigureAwait(false);
 
-                    if (buffer != null && buffer.Length > 0)
+                    if (buffer?.Length > 0)
                     {
                         Task<ImageSource> LoadImage() => tileSource.LoadImageAsync(buffer);