diff --git a/usr/local/bin/sh.zio.backup b/usr/local/bin/sh.zio.backup
index fa02498..d3c7ddc 100755
--- a/usr/local/bin/sh.zio.backup
+++ b/usr/local/bin/sh.zio.backup
@@ -75,12 +75,11 @@ function invoke_restic() {
     elif [[ $command == "self-update" ]]; then
         say warning "Command '$command' not supported. Not running"
     else
-        # TODO: Handle deadlocks (--retry-lock could go on forever)
         "$restic_path" \
             --cache-dir "$cache_dir" \
             --password-file "$restic_repo_passwd_file" \
             --repo "$(cat $restic_repo_file)" \
-            --retry-lock 1m \
+            --retry-lock 1h \
             $command $args
     fi
 }
@@ -266,4 +265,5 @@ else
     arguments="${@:2}"
     say info "Running: $restic_path $command $arguments"
     invoke_restic $command $arguments
+    exit $?
 fi