diff --git a/doc/tomb.1 b/doc/tomb.1
index 2221441..e5067af 100644
--- a/doc/tomb.1
+++ b/doc/tomb.1
@@ -155,6 +155,9 @@ Print more information while running, for debugging purposes
 .B
 .IP "--no-color"
 Don't use colors; useful for old terminals or integration in other scripts
+.B
+.IP "--machine-parseable"
+The output is easily parseable via software. This implies --no-color
 
 
 .SH HOOKS
diff --git a/src/tomb b/src/tomb
index 6a0cada..b5d2068 100755
--- a/src/tomb
+++ b/src/tomb
@@ -1662,6 +1662,9 @@ main() {
     fi
     ### End parsing command-specific options
 
+    if option_is_set --machine-parseable; then
+        opts[--no-color]=''
+    fi
     if ! option_is_set --no-color; then
         autoload colors; colors
     fi
diff --git a/src/undertaker b/src/undertaker
index cd8817c..bf73dca 100755
--- a/src/undertaker
+++ b/src/undertaker
@@ -110,9 +110,6 @@ function main() {
             while true; do
                 undertaker_scheme $scheme $keypath
                 r=$?
-                if [[ $r == 0 ]]; then
-                    exit 0
-                fi
                 if [[ $r == 64 ]]; then
                     exit 64
                 fi