diff --git a/OpenRA.Mods.RA/Lint/CheckTraitPrerequisites.cs b/OpenRA.Mods.RA/Lint/CheckTraitPrerequisites.cs
new file mode 100644
index 0000000000..f8f9e8bd63
--- /dev/null
+++ b/OpenRA.Mods.RA/Lint/CheckTraitPrerequisites.cs
@@ -0,0 +1,36 @@
+#region Copyright & License Information
+/*
+ * Copyright 2007-2011 The OpenRA Developers (see AUTHORS)
+ * This file is part of OpenRA, which is free software. It is made 
+ * available to you under the terms of the GNU General Public License
+ * as published by the Free Software Foundation. For more information,
+ * see COPYING.
+ */
+#endregion
+
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Reflection;
+using OpenRA.Traits;
+
+namespace OpenRA.Mods.RA
+{
+	public class CheckTraitPrerequisites : ILintPass
+	{
+		public void Run(Action<string> emitError, Action<string> emitWarning)
+		{
+			foreach (var actorInfo in Rules.Info.Where(a => !a.Key.StartsWith("^")))
+				try
+				{
+					var traits = actorInfo.Value.TraitsInConstructOrder().ToArray();
+					if (traits.Length == 0)
+						emitWarning("Actor {0} has no traits. Is this intended?".F(actorInfo.Key));
+				}
+				catch(Exception e)
+				{
+					emitError("Actor {0} is not constructible; failure: {1}".F(actorInfo.Key, e.Message));
+				}
+		}
+	}
+}
\ No newline at end of file
diff --git a/OpenRA.Mods.RA/OpenRA.Mods.RA.csproj b/OpenRA.Mods.RA/OpenRA.Mods.RA.csproj
index b7ea37ca48..4bb9c4e38a 100644
--- a/OpenRA.Mods.RA/OpenRA.Mods.RA.csproj
+++ b/OpenRA.Mods.RA/OpenRA.Mods.RA.csproj
@@ -355,6 +355,7 @@
     <Compile Include="Render\RenderHarvester.cs" />
     <Compile Include="Lint\CheckActorReferences.cs" />
     <Compile Include="StrategicVictoryConditions.cs" />
+    <Compile Include="Lint\CheckTraitPrerequisites.cs" />
   </ItemGroup>
   <ItemGroup>
     <ProjectReference Include="..\OpenRA.FileFormats\OpenRA.FileFormats.csproj">