Issue #19304 - Prevent crash from inconsistant error handling until 20264 is done.