HCOLL-167 improved passing errors back