diff -Nru friendly-recovery-0.2.19/debian/changelog friendly-recovery-0.2.20/debian/changelog
--- friendly-recovery-0.2.19/debian/changelog	2012-01-25 18:28:24.000000000 +0000
+++ friendly-recovery-0.2.20/debian/changelog	2012-02-09 16:27:01.000000000 +0000
@@ -1,3 +1,13 @@
+friendly-recovery (0.2.20) precise; urgency=low
+
+  * Update upstart job
+    - Make sure to deal with anything failing (upstarts run with set -e)
+  * Update l10n.sh
+    - If /usr/share/locale doesn't exist, define eval_gettext as a simple
+      echo and return.
+
+ -- Stéphane Graber <stgraber@ubuntu.com>  Thu, 09 Feb 2012 11:25:22 -0500
+
 friendly-recovery (0.2.19) precise; urgency=low
 
   * Update upstart job
diff -Nru friendly-recovery-0.2.19/debian/friendly-recovery.upstart friendly-recovery-0.2.20/debian/friendly-recovery.upstart
--- friendly-recovery-0.2.19/debian/friendly-recovery.upstart	2012-01-25 18:23:54.000000000 +0000
+++ friendly-recovery-0.2.20/debian/friendly-recovery.upstart	2012-02-01 22:04:17.000000000 +0000
@@ -11,26 +11,24 @@
 
 pre-start script
     if plymouth --ping; then
-        plymouth hide-splash
+        plymouth hide-splash || true
     fi
 
     # Try to set the hostname and initialize the console
-    start hostname
-    start console-setup
-    start setvtrgb
+    start hostname || true
+    start console-setup || true
+    start setvtrgb || true
 
     # Emit the mounted event to trigger resolvconf and mounted-run
-    initctl emit mounted MOUNTPOINT=/run
+    initctl emit mounted MOUNTPOINT=/run || true
 
     # Finally start udev
-    start udev
-    udevadm trigger --action=add
-    udevadm settle
+    start udev || true
+    udevadm trigger --action=add || true
+    udevadm settle || true
 
     # And turn off kernel messages (to avoid corrupting the menu)
-    dmesg --console-off
-
-    exit 0
+    dmesg --console-off || true
 end script
 
 script
diff -Nru friendly-recovery-0.2.19/lib/recovery-mode/l10n.sh friendly-recovery-0.2.20/lib/recovery-mode/l10n.sh
--- friendly-recovery-0.2.19/lib/recovery-mode/l10n.sh	2012-01-25 03:38:43.000000000 +0000
+++ friendly-recovery-0.2.20/lib/recovery-mode/l10n.sh	2012-02-09 16:24:41.000000000 +0000
@@ -1,4 +1,13 @@
+# default eval_gettext() to ensure that we do not fail
+# if gettext-base is not installed
+eval_gettext() {
+    echo "$1"
+}
 
+# Deal with systems where /usr isn't mounted
+if [ ! -d /usr/share/locale ]; then
+    return
+fi
 
 # blacklist some languages that we don't have a good console fonts for
 # see bug #573502
@@ -28,11 +37,6 @@
  fi
 fi
 
-# default eval_gettext() to ensure that we do not fail
-# if gettext-base is not installed
-eval_gettext() {
-    echo "$1"
-}
 . gettext.sh
 export TEXTDOMAIN=friendly-recovery
 export TEXTDOMAINDIR=/usr/share/locale