diff --git a/OpenRA.Game/Chrome/WidgetActions.cs b/OpenRA.Game/Chrome/DefaultWidgetDelegates.cs
similarity index 100%
rename from OpenRA.Game/Chrome/WidgetActions.cs
rename to OpenRA.Game/Chrome/DefaultWidgetDelegates.cs
diff --git a/OpenRA.Game/Game.cs b/OpenRA.Game/Game.cs
index c9ebaa89ad..238a318e19 100644
--- a/OpenRA.Game/Game.cs
+++ b/OpenRA.Game/Game.cs
@@ -74,7 +74,8 @@ namespace OpenRA
 			var asms = new List<Pair<Assembly, string>> (typeof(Game).Assembly.GetTypes()
 			                                             .Select(a => a.Namespace)
 			                                             .Distinct()
-			                                             .Select(b => Pair.New(typeof(Game).Assembly, b)));
+			                                             .Where(b => b != null)
+			                                             .Select(c => Pair.New(typeof(Game).Assembly, c)));
 
 			// Mod assemblies assumed to contain a single namespace
 			foreach (var a in m.Assemblies)
diff --git a/OpenRA.Game/OpenRA.Game.csproj b/OpenRA.Game/OpenRA.Game.csproj
index 30a4cc14db..7b32648af9 100644
--- a/OpenRA.Game/OpenRA.Game.csproj
+++ b/OpenRA.Game/OpenRA.Game.csproj
@@ -281,7 +281,7 @@
     <Compile Include="Chrome\Widget.cs" />
     <Compile Include="Chrome\BackgroundWidget.cs" />
     <Compile Include="Chrome\LabelWidget.cs" />
-    <Compile Include="Chrome\WidgetActions.cs" />
+    <Compile Include="Chrome\DefaultWidgetDelegates.cs" />
   </ItemGroup>
   <ItemGroup>
     <ProjectReference Include="..\OpenRA.FileFormats\OpenRA.FileFormats.csproj">