Changed return code standard