diff --git a/raspi-config b/raspi-config
index 95c27b3..2c74e99 100755
--- a/raspi-config
+++ b/raspi-config
@@ -190,8 +190,9 @@ do_change_pass() {
 do_configure_keyboard() {
   dpkg-reconfigure keyboard-configuration &&
   printf "Reloading keymap. This may take a short while\n" &&
-  invoke-rc.d keyboard-setup start &&
+  invoke-rc.d keyboard-setup start || return $?
   udevadm trigger --subsystem-match=input --action=change
+  return 0
 }
 
 do_change_locale() {