am 83d97f46: am 96619f9f: Merge "Add some error-case logging." into gingerbread

Merge commit '83d97f460412f117998f4d446fd65ca79761a294'

* commit '83d97f460412f117998f4d446fd65ca79761a294':
  Add some error-case logging.