Fix a null dereference.

Change-Id: I7224c3368ff414620062bc08b80a6a94d55d7931
Merge "Fix a null dereference."