Handle null correctly.

Bug: 2353544
1 file changed