diff --git a/tools/common/Assembly.cs b/tools/common/Assembly.cs
index e87e27ce5011..daead53c6da5 100644
--- a/tools/common/Assembly.cs
+++ b/tools/common/Assembly.cs
@@ -69,11 +69,13 @@ public string FullPath {
 			}
 		}
 		public string FileName { get { return Path.GetFileName (FullPath); } }
-		public string Identity { get { return GetIdentity (FullPath); } }
+		public string Identity { get { return GetIdentity (AssemblyDefinition); } }
 
 		public static string GetIdentity (AssemblyDefinition ad)
 		{
-			return Path.GetFileNameWithoutExtension (ad.MainModule.FileName);
+			if (!string.IsNullOrEmpty (ad.MainModule.FileName))
+				return Path.GetFileNameWithoutExtension (ad.MainModule.FileName);
+			return ad.Name.Name;
 		}
 
 		public static string GetIdentity (string path)