more error flow logic for cluster