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