Merge pull request #1350 from Jaiz909/description-keyerror-fix