Added more granular exception handling