Fixed two Exceptions
Merge branch 'master' of https://github.com/lfuelling/railgun