Merge "Sends the correct error code" into rvc-dev