Propagate more error codes internally