diff --git a/src/Client/Backblaze.Client.csproj b/src/Client/Backblaze.Client.csproj
index 640a322..e4f968c 100644
--- a/src/Client/Backblaze.Client.csproj
+++ b/src/Client/Backblaze.Client.csproj
@@ -10,7 +10,7 @@
     <Authors>Microcompiler</Authors>
     <Company>Bytewizer Inc.</Company>
     <Product>Backblaze B2 Cloud Storage</Product>
-    <LangVersion>7.1</LangVersion>
+    <LangVersion>8.0</LangVersion>
     <RootNamespace>Bytewizer.Backblaze</RootNamespace>
     <VersionPrefix>1.1.0</VersionPrefix>
     <Version Condition=" '$(Version)' == '' and '$(VersionSuffix)' != '' ">$(VersionPrefix)-$(VersionSuffix)</Version>
diff --git a/src/Client/Client/Storage/Storage.cs b/src/Client/Client/Storage/Storage.cs
index 25a25ac..d70d3d1 100644
--- a/src/Client/Client/Storage/Storage.cs
+++ b/src/Client/Client/Storage/Storage.cs
@@ -28,6 +28,8 @@ protected Storage(HttpClient client, IClientOptions options, ILoggerFactory logg
             try
             {
                 // Initialize components
+                logger ??= NullLoggerFactory.Instance;
+
                 _client = new ApiClient(client, options, logger.CreateLogger<ApiClient>(), cache);
                 _logger = logger.CreateLogger<Storage>();
             }
diff --git a/test/Unit/Backblaze.Tests.Unit.csproj b/test/Unit/Backblaze.Tests.Unit.csproj
index 321dd10..4de1c14 100644
--- a/test/Unit/Backblaze.Tests.Unit.csproj
+++ b/test/Unit/Backblaze.Tests.Unit.csproj
@@ -26,6 +26,7 @@
 
   <ItemGroup>
     <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.11.1" />
+    <PackageReference Include="NSubstitute" Version="5.1.0" />
     <PackageReference Include="xunit" Version="2.9.2" />
     <PackageReference Include="xunit.runner.visualstudio" Version="2.8.2">
       <PrivateAssets>all</PrivateAssets>
diff --git a/test/Unit/BackblazeClientTests.cs b/test/Unit/BackblazeClientTests.cs
new file mode 100644
index 0000000..c25caa9
--- /dev/null
+++ b/test/Unit/BackblazeClientTests.cs
@@ -0,0 +1,41 @@
+using System.Net.Http;
+
+using Bytewizer.Backblaze.Client;
+
+using Microsoft.Extensions.Caching.Memory;
+
+using Xunit;
+
+using NSubstitute;
+
+namespace Backblaze.Tests.Unit
+{
+	public class BackblazeClientTests
+	{
+		[Fact]
+		public void BackblazeClient_constructor_does_not_crash_on_null_loggerFactory()
+		{
+			// Arrange
+			var clientOptions = new ClientOptions();
+
+			var dummyMemoryCache = Substitute.For<IMemoryCache>();
+
+			// Act & Assert
+      new BackblazeClient(clientOptions, logger: null, dummyMemoryCache);
+		}
+
+		[Fact]
+		public void BackblazeClient_constructor_with_HttpClient_does_not_crash_on_null_loggerFactory()
+		{
+			// Arrange
+			var clientOptions = new ClientOptions();
+
+			var httpClient = new HttpClient();
+
+			var dummyMemoryCache = Substitute.For<IMemoryCache>();
+
+			// Act & Assert
+      new BackblazeClient(httpClient, clientOptions, logger: null, dummyMemoryCache);
+		}
+	}
+}