Merge commit '1b0f6e82f6b4e34109117b77db156cd53da1be94' * commit '1b0f6e82f6b4e34109117b77db156cd53da1be94': if exception getMessage() is null, don't add it to the error