diff --git a/ChangeLog b/ChangeLog
index 6aea29c3a..8b5ed2048 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2008-09-24  Mike Kestner  <mkestner@novell.com>
+
+	* glib/GType.cs: just fail on location null or empty instead of
+	checking the assembly type.  Avoids failures on the ms runtime.
+
 2008-09-23  Mike Kestner  <mkestner@novell.com>
 
 	* bootstrap-2.12: bump svn version after tag.
diff --git a/glib/GType.cs b/glib/GType.cs
index 5a2001c12..f0af3544c 100755
--- a/glib/GType.cs
+++ b/glib/GType.cs
@@ -160,8 +160,7 @@ namespace GLib {
 			visited [asm] = asm;
 			Type result = asm.GetType (type_name);
 			if (result == null) {
-				if (asm is System.Reflection.Emit.AssemblyBuilder)
-					/* These don't support Location */
+				if (asm.Location == null || asm.Location.Length == 0)
 					return null;
 				string asm_dir = Path.GetDirectoryName (asm.Location);
 				foreach (AssemblyName ref_name in asm.GetReferencedAssemblies ()) {