Add some additional logging around errors