Handle errors better
1.14.3