Merge "Change to not send error response twice."