diff --git a/ChangeLog b/ChangeLog
index 7548d2bf..ace474ee 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -6,6 +6,12 @@
 	address of the callsite, so we can detect recursive invocations of
 	mono_generic_trampoline().
 
+2009-11-05  Martin Baulig  <martin@ximian.com>
+
+	* languages/mono/MonoLanguageBackend.cs
+	(MonoLanguageBackend.Notification): On `LoadModule': don't crash
+	if load_symfile() failed.
+
 2009-10-08  Martin Baulig  <martin@ximian.com>
 
 	* build/mdb: Use the full pathname to invoke mono.
diff --git a/languages/mono/MonoLanguageBackend.cs b/languages/mono/MonoLanguageBackend.cs
index 29e1dd47..1a865cc6 100644
--- a/languages/mono/MonoLanguageBackend.cs
+++ b/languages/mono/MonoLanguageBackend.cs
@@ -1400,6 +1400,8 @@ internal string GetShadowCopyLocation (string path)
 				MonoSymbolFile symfile = load_symfile (inferior, data);
 				Report.Debug (DebugFlags.JitSymtab,
 					      "Module load: {0} {1}", data, symfile);
+				if (symfile == null)
+					break;
 				engine.Process.Debugger.OnModuleLoaded (symfile.Module);
 				if ((builtin_types != null) && (symfile != null)) {
 					if (engine.OnModuleLoaded (symfile.Module))