Merge pull request #9841 from MrPetovan/bug/fatal-errors