diff --git a/src/Directory.Packages.props b/src/Directory.Packages.props
index 107022ba5..f2dd7f294 100644
--- a/src/Directory.Packages.props
+++ b/src/Directory.Packages.props
@@ -25,7 +25,7 @@
     <PackageVersion Include="Ninject" Version="3.3.6" />
     <PackageVersion Include="NLog" Version="5.3.3" />
     <PackageVersion Include="Prism.Core" Version="9.0.537" />
-    <PackageVersion Include="Prism.Forms" Version="8.1.97" />
+    <PackageVersion Include="Prism.Forms" Version="9.0.537" />
     <PackageVersion Include="ReactiveUI" Version="20.1.1" />
     <PackageVersion Include="Roslynator.Analyzers" Version="4.12.4" />
     <PackageVersion Include="Serilog" Version="4.0.1" />
diff --git a/src/Splat.Prism/SplatContainerExtension.cs b/src/Splat.Prism/SplatContainerExtension.cs
index d91db1041..a4ba65b9a 100644
--- a/src/Splat.Prism/SplatContainerExtension.cs
+++ b/src/Splat.Prism/SplatContainerExtension.cs
@@ -44,11 +44,6 @@ public void Dispose()
         GC.SuppressFinalize(this);
     }
 
-    /// <inheritdoc/>
-    public void FinalizeExtension()
-    {
-    }
-
     /// <inheritdoc/>
     public IContainerRegistry RegisterScoped(Type type, Func<IContainerProvider, object> factoryMethod) => throw new NotSupportedException();
 
@@ -208,28 +203,28 @@ public IContainerRegistry RegisterSingleton(Type from, Type to, string name)
     public IContainerRegistry RegisterSingleton(Type type, Func<IContainerProvider, object> factoryMethod) => throw new NotSupportedException();
 
     /// <inheritdoc/>
-    public object? Resolve(Type type) => Instance.GetService(type);
+    public object Resolve(Type type) => Instance.GetService(type) ?? throw new InvalidOperationException("Must be a valid value");
 
     /// <inheritdoc/>
     [System.Diagnostics.CodeAnalysis.SuppressMessage("StyleCop.CSharp.NamingRules", "SA1316:Tuple element names should use correct casing", Justification = "Defined by outside interface not in Splat")]
-    public object? Resolve(Type type, params (Type Type, object Instance)[] parameters) =>
-        _types.TryGetValue((type, null), out var resolvedType)
+    public object Resolve(Type type, params (Type Type, object Instance)[] parameters) =>
+        (_types.TryGetValue((type, null), out var resolvedType)
             ? Activator.CreateInstance(resolvedType, parameters.Select(x => x.Instance)) ?? throw new InvalidOperationException("Could not create type")
-            : default;
+            : default) ?? throw new InvalidOperationException("Must be a valid value");
 
     /// <inheritdoc/>
-    public object? Resolve(Type type, string name) => Instance.GetService(type, name);
+    public object Resolve(Type type, string name) => Instance.GetService(type, name) ?? throw new InvalidOperationException("Must be a valid value");
 
     /// <inheritdoc/>
     [System.Diagnostics.CodeAnalysis.SuppressMessage("StyleCop.CSharp.NamingRules", "SA1316:Tuple element names should use correct casing", Justification = "Defined by outside interface not in Splat")]
-    public object? Resolve(Type type, string name, params (Type Type, object Instance)[] parameters) =>
-        !_types.TryGetValue((type, name), out var resolvedType)
+    public object Resolve(Type type, string name, params (Type Type, object Instance)[] parameters) =>
+        (!_types.TryGetValue((type, name), out var resolvedType)
             ? resolvedType switch
             {
                 null => default,
                 _ => Activator.CreateInstance(resolvedType, parameters.Select(x => x.Instance))
             }
-            : default;
+            : default) ?? throw new InvalidOperationException("Must be a valid value");
 
     /// <summary>
     /// Disposes data associated with the extension.