Corrected unhandled exceptions
Merge pull request #2 from RobinPetit/master

Corrected unhandled exceptions