Merge pull request #6506 from MrPetovan/bug/6386-fix-fatal-errors