diff --git a/Templates.csproj b/Templates.csproj
index d0db691..21c3829 100644
--- a/Templates.csproj
+++ b/Templates.csproj
@@ -2,7 +2,7 @@
 
   <PropertyGroup>
     <PackageType>Template</PackageType>
-    <PackageVersion>1.7.2</PackageVersion>
+    <PackageVersion>1.7.3</PackageVersion>
     <PackageId>Keboo.Dotnet.Templates</PackageId>
     <Title>Keboo's .NET Templates</Title>
     <Authors>Keboo</Authors>
diff --git a/templates/Avalonia/AvaloniaSolution/SampleAvaloniaApplication/ServiceCollectionExtensions.cs b/templates/Avalonia/AvaloniaSolution/SampleAvaloniaApplication/ServiceCollectionExtensions.cs
index a751ccc..6e503d4 100644
--- a/templates/Avalonia/AvaloniaSolution/SampleAvaloniaApplication/ServiceCollectionExtensions.cs
+++ b/templates/Avalonia/AvaloniaSolution/SampleAvaloniaApplication/ServiceCollectionExtensions.cs
@@ -20,7 +20,7 @@ public static void AddServices(this IServiceCollection services)
     private static void AddAvaloniaServices(this IServiceCollection services)
     {
         services.AddSingleton<IDispatcher>(_ => Dispatcher.UIThread);
-        services.AddSingleton(_ => Application.Current?.ApplicationLifetime ?? NoopApplicationLifetime.Instance);
+        services.AddSingleton(_ => Application.Current?.ApplicationLifetime ?? throw new InvalidOperationException("No application lifetime is set"));
 
         services.AddSingleton(sp =>
             sp.GetRequiredService<IApplicationLifetime>() switch
@@ -49,15 +49,4 @@ private static void AddView<TView, TViewModel>(this IServiceCollection services)
         services.AddTransient<TViewModel>();
         services.AddTransient<TView>();
     }
-
-    private sealed class NoopApplicationLifetime : IDisposable, IApplicationLifetime
-    {
-        private static readonly Lazy<NoopApplicationLifetime> _instance = new(() => new NoopApplicationLifetime());
-        public static IApplicationLifetime Instance => _instance.Value;
-
-        private NoopApplicationLifetime()
-        { }
-
-        public void Dispose() { }
-    }
 }