diff --git a/Directory.Build.props b/Directory.Build.props
index bfb58c1..666ff07 100644
--- a/Directory.Build.props
+++ b/Directory.Build.props
@@ -5,7 +5,6 @@
         <Nullable>enable</Nullable>
         <ImplicitUsings>enable</ImplicitUsings>
         <DockerDefaultTargetOS>Linux</DockerDefaultTargetOS>
-        <WarningsAsErrors>CS8602</WarningsAsErrors>
     </PropertyGroup>
 
 </Project>
\ No newline at end of file
diff --git a/src/MacroDeck.UpdateService.Core/Managers/VersionManager.cs b/src/MacroDeck.UpdateService.Core/Managers/VersionManager.cs
index 0c85b2b..d6e64a3 100644
--- a/src/MacroDeck.UpdateService.Core/Managers/VersionManager.cs
+++ b/src/MacroDeck.UpdateService.Core/Managers/VersionManager.cs
@@ -94,7 +94,7 @@ public async ValueTask<VersionInfo> GetLatestVersion(PlatformIdentifier platform
         var versionEntity = await _versionRepository.GetLatestVersion(platformIdentifier, includePreviewVersions)
                ?? throw new NoVersionFoundException();
 
-        return _mapper.Map<VersionInfo>(versionEntity);
+        return _mapper.Map<VersionInfo>(versionEntity) ?? throw new NoVersionFoundException();
     }
 
     public async ValueTask<VersionInfo> GetVersion(string version)
@@ -102,7 +102,7 @@ public async ValueTask<VersionInfo> GetVersion(string version)
         var versionEntity = await _versionRepository.GetVersionInfo(version)
                ?? throw new VersionDoesNotExistException();
 
-        return _mapper.Map<VersionInfo>(versionEntity);
+        return _mapper.Map<VersionInfo>(versionEntity) ?? throw new NoVersionFoundException();
     }
 
     public async ValueTask<VersionEntity> GetOrCreateVersion(string version)
diff --git a/src/MacroDeck.UpdateService/Dockerfile b/src/MacroDeck.UpdateService/Dockerfile
index 62e64bb..cda3cf3 100644
--- a/src/MacroDeck.UpdateService/Dockerfile
+++ b/src/MacroDeck.UpdateService/Dockerfile
@@ -5,7 +5,7 @@ WORKDIR /app
 FROM ${BASE_IMAGE} AS build
 WORKDIR /src/src/MacroDeck.UpdateService/
 
-RUN dotnet msbuild "MacroDeck.UpdateService.csproj" -warnAsMessage:CS0618 -warnAsError -p:Configuration=Release
+RUN dotnet msbuild "MacroDeck.UpdateService.csproj" -p:Configuration=Release
 
 FROM build AS publish
 RUN dotnet publish -c Release -o /app