[RFR] Better error handling