Fix for potential null access.

Test: refactor CL, presubmit passes
Change-Id: I6908bb0686186df3f8f99247c4cc099224c48e2b
1 file changed