Merge pull request #451 from okorach:handle-non-existing-project-keys

Merge pull request #451 from okorach:handle-non-existing-project-keys #2025