diff --git a/server/src/FilterLists.Data/FilterLists.Data.csproj b/server/src/FilterLists.Data/FilterLists.Data.csproj
index 1e21aaa6f..c64f127f1 100644
--- a/server/src/FilterLists.Data/FilterLists.Data.csproj
+++ b/server/src/FilterLists.Data/FilterLists.Data.csproj
@@ -15,6 +15,7 @@
   </PropertyGroup>
 
   <ItemGroup>
+    <PackageReference Include="Ardalis.GuardClauses" Version="1.4.1" />
     <PackageReference Include="JetBrains.Annotations" Version="2019.1.3" />
     <PackageReference Include="Microsoft.CodeAnalysis.FxCopAnalyzers" Version="2.9.8">
       <PrivateAssets>all</PrivateAssets>
diff --git a/server/src/FilterLists.Data/FilterListsDbContext.cs b/server/src/FilterLists.Data/FilterListsDbContext.cs
index 7f2b78a9c..608f89fbc 100644
--- a/server/src/FilterLists.Data/FilterListsDbContext.cs
+++ b/server/src/FilterLists.Data/FilterListsDbContext.cs
@@ -1,4 +1,5 @@
-using FilterLists.Data.Entities;
+using Ardalis.GuardClauses;
+using FilterLists.Data.Entities;
 using FilterLists.Data.Entities.Junctions;
 using Microsoft.EntityFrameworkCore;
 
@@ -31,6 +32,7 @@ public FilterListsDbContext(DbContextOptions options) : base(options)
 
         protected override void OnModelCreating(ModelBuilder modelBuilder)
         {
+            Guard.Against.Null(modelBuilder, nameof(modelBuilder));
             modelBuilder.ApplyConfigurationsFromAssembly(typeof(FilterListsDbContext).Assembly);
         }
     }