Project: Exception handling. (#1013)
Minor Fixes.