Chg: dev: Backport removal of SystemExit from 0.9