Update the error handing static functions for r178161.
Part of rdar://13296693