Add exitFlag. Don't exit early, and don't block forever

SignOff: Mohamed Ibrahim