- add some exit-on-crash stuff, hope it catches the important cases