[PATCH 06/10] Make exception handling more specific