Core/SAI: changed multiple validation checks