Added SystemExit/Interrupt catch