Improved error throw
Merge branch 'master' of https://github.com/ThomasKluiters/Jisp