Merge "NPE fix" into honeycomb