Streamline exception hierarchy. Make sure they propagate to client properly