Improve replication controller errro handling.