More fixes for Rx error handling.