D-16992 Code changes to return sensible error codes