Fix null pointer dereference.
am: d0b096052c

Change-Id: I0a9858e8351742a5e440fd2aa886b12ede0b433e