Ensure ErrorExceptions are called from the global namespace
Merge remote-tracking branch 'main/master' into composer2