diff --git a/src/DependencyInjection.Analyzers/AssemblyCollection.cs b/src/DependencyInjection.Analyzers/AssemblyCollection.cs
index 2758dfb37..372dfac0b 100644
--- a/src/DependencyInjection.Analyzers/AssemblyCollection.cs
+++ b/src/DependencyInjection.Analyzers/AssemblyCollection.cs
@@ -131,7 +131,7 @@ Request request
                         Diagnostics.UnhandledException,
                         null,
                         e.Message,
-                        e.StackTrace,
+                        e.StackTrace.Replace("\r", "").Replace("\n", ""),
                         e.GetType().Name,
                         e.ToString()
                     )
diff --git a/src/DependencyInjection.Analyzers/ReflectionCollection.cs b/src/DependencyInjection.Analyzers/ReflectionCollection.cs
index de2ef5bbe..e393d0913 100644
--- a/src/DependencyInjection.Analyzers/ReflectionCollection.cs
+++ b/src/DependencyInjection.Analyzers/ReflectionCollection.cs
@@ -47,7 +47,7 @@ public static MethodDeclarationSyntax Execute(Request request)
                         Diagnostics.UnhandledException,
                         null,
                         e.Message,
-                        e.StackTrace,
+                        e.StackTrace.Replace("\r", "").Replace("\n", ""),
                         e.GetType().Name,
                         e.ToString()
                     )
@@ -133,7 +133,7 @@ internal static ImmutableArray<Item> GetTypeDetails(
                         Diagnostics.UnhandledException,
                         null,
                         e.Message,
-                        e.StackTrace,
+                        e.StackTrace.Replace("\r", "").Replace("\n", ""),
                         e.GetType().Name,
                         e.ToString()
                     )
diff --git a/src/DependencyInjection.Analyzers/ServiceDescriptorCollection.cs b/src/DependencyInjection.Analyzers/ServiceDescriptorCollection.cs
index 5e9413b83..3689060d0 100644
--- a/src/DependencyInjection.Analyzers/ServiceDescriptorCollection.cs
+++ b/src/DependencyInjection.Analyzers/ServiceDescriptorCollection.cs
@@ -46,7 +46,7 @@ public static MethodDeclarationSyntax Execute(Request request)
                         Diagnostics.UnhandledException,
                         null,
                         e.Message,
-                        e.StackTrace,
+                        e.StackTrace.Replace("\r", "").Replace("\n", ""),
                         e.GetType().Name,
                         e.ToString()
                     )
@@ -115,7 +115,7 @@ internal static ImmutableArray<Item> GetTypeDetails(
                         Diagnostics.UnhandledException,
                         null,
                         e.Message,
-                        e.StackTrace,
+                        e.StackTrace.Replace("\r", "").Replace("\n", ""),
                         e.GetType().Name,
                         e.ToString()
                     )
@@ -165,7 +165,7 @@ HashSet<IAssemblySymbol> privateAssemblies
         var asSelf = serviceTypes.ServiceTypeDescriptors.OfType<SelfServiceTypeDescriptor>().Any() || !serviceTypes.ServiceTypeDescriptors.Any();
         var asImplementedInterfaces = serviceTypes.ServiceTypeDescriptors.OfType<ImplementedInterfacesServiceTypeDescriptor>().ToArray();
         var asMatchingInterface = serviceTypes.ServiceTypeDescriptors.OfType<MatchingInterfaceServiceTypeDescriptor>().Any();
-        var asSpecificTypes = serviceTypes.ServiceTypeDescriptors.OfType<CompiledServiceTypeDescriptor>().Select(z => z.Type).ToArray();
+        var asSpecificTypes = serviceTypes.ServiceTypeDescriptors.OfType<CompiledServiceTypeDescriptor>().Select(z => z.Type).Where(z => z is { }).ToArray();
         var registrationLifetimeAttribute = compilation.GetTypeByMetadataName("Rocket.Surgery.DependencyInjection.RegistrationLifetimeAttribute")!;
 
         var services = new List<InvocationExpressionSyntax>();