diff --git a/zero.Core/Configuration/ZeroOptions.cs b/zero.Core/Configuration/ZeroOptions.cs
index 4afaa36d..e580e7e0 100644
--- a/zero.Core/Configuration/ZeroOptions.cs
+++ b/zero.Core/Configuration/ZeroOptions.cs
@@ -32,7 +32,7 @@ public class ZeroOptions : IZeroOptions
   {
     Type type = typeof(TOptions);
 
-    if (!OptionsCache.TryGetValue(type, out object value))
+    if (!OptionsCache.TryGetValue(type, out object value) && ServiceProvider != null)
     {
       IOptions<TOptions> options = ServiceProvider.GetService<IOptions<TOptions>>();
       value = options.Value;
diff --git a/zero.Core/Persistence/ZeroDocumentConventionsBuilder.cs b/zero.Core/Persistence/ZeroDocumentConventionsBuilder.cs
index 6bb7e4fc..423a11e2 100644
--- a/zero.Core/Persistence/ZeroDocumentConventionsBuilder.cs
+++ b/zero.Core/Persistence/ZeroDocumentConventionsBuilder.cs
@@ -123,7 +123,7 @@ public class ZeroDocumentConventionsBuilder : IZeroDocumentConventionsBuilder
   protected virtual string TransformTypeCollectionNameToDocumentIdPrefix(string name)
   {
     RavenOptions options = Options.For<RavenOptions>();
-    if (!options.CollectionPrefix.IsNullOrWhiteSpace())
+    if (options != null && !options.CollectionPrefix.IsNullOrWhiteSpace())
     {
       name = options.CollectionPrefix.EnsureEndsWith(IdentityPartsSeparator) + name.TrimStart(options.CollectionPrefix);
     }