I would consider at least the fix in the logger definition for backporting: I'm not sure if generating that specific error would otherwise work at runtime.