Project: Exception handling (#1013)

* Fixes #1013.
* Minor Fixes.