Merge "Fix null pointer dereference." into nyc-dev am: dac26a76c3
am: 798ba98d5b

* commit '798ba98d5bba001dfbbe98e1fb507a703fa67c4d':
  Fix null pointer dereference.

Change-Id: I00bb83c758ef1061b121bf0b228f1b7e57d329fe