diff --git a/tests/generator-Tests/Unit-Tests/ReportTests.cs b/tests/generator-Tests/Unit-Tests/ReportTests.cs
new file mode 100644
index 000000000..bd04a850d
--- /dev/null
+++ b/tests/generator-Tests/Unit-Tests/ReportTests.cs
@@ -0,0 +1,30 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+using MonoDroid.Generation;
+using NUnit.Framework;
+
+namespace generatortests
+{
+	public class ReportTests
+	{
+		[Test]
+		public void FormatTests ()
+		{
+			var code = 0x37;
+			var msg = "There was a {0} error";
+			var args = "bad";
+			var sourcefile = @"C:\code\test.cs";
+			var line = 32;
+			var col = 12;
+
+			Assert.AreEqual ("error BG0037: There was a bad error", Report.Format (true, code, null, 0, 0, msg, args));
+			Assert.AreEqual (@"C:\code\test.cs: error BG0037: There was a bad error", Report.Format (true, code, sourcefile, 0, 0, msg, args));
+			Assert.AreEqual (@"C:\code\test.cs(32): error BG0037: There was a bad error", Report.Format (true, code, sourcefile, line, 0, msg, args));
+			Assert.AreEqual (@"C:\code\test.cs(32, 12): error BG0037: There was a bad error", Report.Format (true, code, sourcefile, line, col, msg, args));
+			Assert.AreEqual (@"C:\code\test.cs(32, 12): warning BG0037: There was a bad error", Report.Format (false, code, sourcefile, line, col, msg, args));
+		}
+	}
+}
diff --git a/tools/generator/Utilities/Report.cs b/tools/generator/Utilities/Report.cs
index b752b00e2..127f7fc21 100644
--- a/tools/generator/Utilities/Report.cs
+++ b/tools/generator/Utilities/Report.cs
@@ -129,9 +129,25 @@ public static string FormatCodedMessage (bool error, LocalizedMessage message, p
 		
 		public static string Format (bool error, int errorCode, string sourceFile, int line, int column, string format, params object[] args)
 		{
-			var origin = sourceFile != null ? sourceFile + (line > 0 ? column > 0 ? $"({line}, {column})" : $"({line})" : null) + ' ' : null;
-			return string.Format ("{0}{1} BG{2:X04}: ", origin, error ? "error" : "warning", errorCode) +
-				string.Format (format, args);
+			var origin = FormatOrigin (sourceFile, line, column);
+
+			return $"{origin}{(error ? "error" : "warning")} BG{errorCode:X04}: " + string.Format (format, args);
+		}
+
+		static string FormatOrigin (string sourceFile, int line, int column)
+		{
+			if (string.IsNullOrWhiteSpace (sourceFile))
+				return null;
+
+			var ret = sourceFile;
+
+			if (line == 0)
+				return ret + ": ";
+
+			if (column > 0)
+				return ret + $"({line}, {column}): ";
+
+			return ret + $"({line}): ";
 		}
 	}