am fd15686a: Merge "Fix an NPE"

* commit 'fd15686ae915d9a95f1b6d52b1fc720bf745d77c':
  Fix an NPE