Fixes show-stopping exception
Merge pull request #3 from sdegutis/master

Fixes show-stopping exception