diff --git a/ChangeLog b/ChangeLog
index 009b4dc11..44d5887ea 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2008-01-26  Pavel Roskin  <proski@gnu.org>
+
+	* kern/dl.c (grub_dl_load): Don't abort if prefix is not set,
+	just return an error.
+
 2008-01-26  Bean  <bean123ch@gmail.com>
 
 	* fs/reiserfs.c (grub_fshelp_node): New member next_offset.
diff --git a/kern/dl.c b/kern/dl.c
index d3488fbda..9e8c24aba 100644
--- a/kern/dl.c
+++ b/kern/dl.c
@@ -625,8 +625,10 @@ grub_dl_load (const char *name)
   if (mod)
     return mod;
   
-  if (! grub_dl_dir)
-    grub_fatal ("module dir is not initialized yet");
+  if (! grub_dl_dir) {
+    grub_error (GRUB_ERR_FILE_NOT_FOUND, "\"prefix\" is not set");
+    return 0;
+  }
 
   filename = (char *) grub_malloc (grub_strlen (grub_dl_dir) + 1
 				   + grub_strlen (name) + 4 + 1);