addiing additional empty validations for iOS