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