React to more commands and don't catch SystemExit