am e6803818: am a9e35b6e: Prevent a null pointer exception.

Merge commit 'e680381839dee8d0ebdc6dd8cf882f66ea5c6c1a'

* commit 'e680381839dee8d0ebdc6dd8cf882f66ea5c6c1a':
  Prevent a null pointer exception.