am 8bea5f74: am f3fe6820: Merge "NPE fix" into honeycomb

* commit '8bea5f74499ea32dcf9775bfa62fdd9440c20f8f':
  NPE fix