Cleanup return code and move to more likely trigger location