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