Updated return codes for #5