New exception caught and fix for issue #16 #17

Closed Nokeo08 closed 6 years ago