diff --git a/gdb/ChangeLog b/gdb/ChangeLog
index d982e29246..68a9181718 100644
--- a/gdb/ChangeLog
+++ b/gdb/ChangeLog
@@ -1,3 +1,8 @@
+2006-03-24  Randolph Chung  <tausq@debian.org>
+
+	* solib-som.c (link_map_start): Don't error out if there is
+	not yet a link map.
+
 2006-03-24  Daniel Jacobowitz  <dan@codesourcery.com>
 
 	* linux-nat.c (linux_ops_saved): New.
diff --git a/gdb/solib-som.c b/gdb/solib-som.c
index 3d027ccf70..52c7367c47 100644
--- a/gdb/solib-som.c
+++ b/gdb/solib-som.c
@@ -520,7 +520,7 @@ link_map_start (void)
   read_memory (addr, buf, 4);
   addr = extract_unsigned_integer (buf, 4);
   if (addr == 0)
-    error (_("Debugging dynamic executables loaded via the hpux8 dld.sl is not supported."));
+    return 0;
 
   read_memory (addr, buf, 4);
   return extract_unsigned_integer (buf, 4);