Merge "Return a valid error code when adding an invalid IP address."