Merge "Add some error checking." into honeycomb