[PATCH 5/5] Exceptions: Cleanup excepions and error messages