Fix incorrect for if 'catchAllIsValid' is set

Check for the option catchAllIsValid was always overriding the passed in value
Merge pull request #7 from jverb/master

Fix incorrect for if 'catchAllIsValid' is set