Check whether or not we should re-throw or indicate the caught exceptions

Signed-off-by: Clement Escoffier <clement.escoffier@gmail.com>