Fixes

Added exceptions
Merge pull request #3 from cptbullet/master

Fixes