antoniop
committed
on 18 Jun 21
Take more advantage of exception handling