Merge "Improve logging of exceptions which are not thrown but attached to context"