Add error handling to setup-commands.