Merge pull request #19492 from demeritcowboy/fatalerrorhandler