am a024ac6b: Merge "Fix an NPE"

* commit 'a024ac6b206316a96d472d4e2dd3ef1a22e05eac':
  Fix an NPE