am f3fe6820: Merge "NPE fix" into honeycomb

* commit 'f3fe6820927d335f09c27e026702d2b0d4a69923':
  NPE fix