add back the return for the error check