Adding better errors to production