Merge commit '7f8f1e13d346bc2d645e9625660aae0c9ee1749d' * commit '7f8f1e13d346bc2d645e9625660aae0c9ee1749d': Add some error-case logging.
Merge commit '7f8f1e13d346bc2d645e9625660aae0c9ee1749d' * commit '7f8f1e13d346bc2d645e9625660aae0c9ee1749d': Add some error-case logging.