MODE-1935 -Fixed logging of unexpected error messages.