exceptions clean up