That code already changed in 6.1, maybe not so important for 6.0?
SpaceToad commented
6.0 is aimed at becoming the main BC release for some time, so it'd be good if we could make it crash free as much as possible. I'm pretty sure the fix for that one won't be too much of an issue.
