Handle exceptions and errors better, tag 1.5.3