Add better error messages to lock-n-run