Added missing rv check - caught by clang