handle exceptions
Merge pull request #30 from Toranos/yoann/integration_release_1

handle exceptions