Remove excessive exception checks
Fix inheritance