Fixed #224

* Removed exit where it was obsolete
* Replaced exit whenever possible with sth more senseful
* Added reasoning to the places where exit is required
Merge pull request #234 from frmwrk123/fix/224

Fixed #224