Fix generator error seen in logs - #140
Merge pull request #141 from jembi/generator-error

Fix generator error seen in logs - #140