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