Fix Exception
Merge pull request #3 from flyboarder/master

Fix Exception