Streamline exception handling