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