Try to cleanup the error handling a bit so there aren't false positives from static analysis. v was already checked for NULL above, so we don't need a second check.