[noticket] Improve logging of errors, so you know which resource it is talking about.
[merge]
[noticket] Improve logging.