Merge "Add some error-case logging." into gingerbread