No code changes needed: in the places where we actually check the return value of these functions, we handle it correctly.