WCMIO-13 add checks for isValid