Avoid potential NPE in CVF

b/17471688

Change-Id: Iea162b21995a93927c6a1e3238c1e9bb4a922131
2 files changed