Validations bug with discovery
Merge pull request #1099 from lukecampbell/discovery

Validations bug with discovery