Use proper return code