fix up validation logic
Merge pull request #317 from bparees/validation_fix

Merged by openshift-bot