diff --git a/OpenRA.Game/TraitDictionary.cs b/OpenRA.Game/TraitDictionary.cs
index 62210f4a59..a60bce30a9 100755
--- a/OpenRA.Game/TraitDictionary.cs
+++ b/OpenRA.Game/TraitDictionary.cs
@@ -156,7 +156,7 @@ namespace OpenRA
 				if (index >= actors.Count || actors[index].ActorID != actor)
 					return default(T);
 				else if (index + 1 < actors.Count && actors[index + 1].ActorID == actor)
-					throw new InvalidOperationException("Actor has multiple traits of type `{0}`".F(typeof(T)));
+					throw new InvalidOperationException("Actor {0} has multiple traits of type `{1}`".F(actors[index].Info.Name, typeof(T)));
 				else return traits[index];
 			}