Error logging to help diagnose Vanilla-338