diff --git a/ChangeLog b/ChangeLog
index 61e4ea8ec..fb73905e2 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2010-06-02  Colin Watson  <cjwatson@ubuntu.com>
+
+	* util/grub.d/00_header.in: Add safety check to make sure that
+	${locale_dir} exists before trying to probe it.
+
 2010-06-02  Colin Watson  <cjwatson@ubuntu.com>
 
 	* docs/grub.texi (SCO UnixWare): Remove, at Vladimir's request and
diff --git a/util/grub.d/00_header.in b/util/grub.d/00_header.in
index df8f5dfaa..0a5cfac18 100644
--- a/util/grub.d/00_header.in
+++ b/util/grub.d/00_header.in
@@ -195,7 +195,7 @@ EOF
 esac
 
 # Gettext variables and module
-if [ "x${LANG}" != "xC" ] ; then
+if [ "x${LANG}" != "xC" ] && [ -d "${locale_dir}" ] ; then
     prepare_grub_to_access_device $(${grub_probe} --target=device ${locale_dir})
   cat << EOF
 set locale_dir=(\$root)$(make_system_path_relative_to_its_root ${locale_dir})