This reverts commit 041fb18415.
041fb18415
Provide more context when logging errors, and a friendlier message.