adding better errors back in.