Remove excessive exception checks