Better error handling & coverage around errors