Merge "Add null check" into honeycomb-mr1