Merge "Avoid strerror until we are sure there is an error"