Merge commit '0cd2472bf8a0062b56b9cd4613c44791b32fe42f' * commit '0cd2472bf8a0062b56b9cd4613c44791b32fe42f': Add some explicit error log messages
Merge commit '0cd2472bf8a0062b56b9cd4613c44791b32fe42f' * commit '0cd2472bf8a0062b56b9cd4613c44791b32fe42f': Add some explicit error log messages