Improve status error messages. Retry harder on git failure.