More Bug Fixes

* Added missing exit