Fix #1003
Replace throwable catch by exception