Replace throwable catch by exception
Merge pull request #1006 from emmanuel-keller/1.5

Replace throwable catch by exception