Add some initial validation logic.
Merge pull request #678 from brendandburns/fix

Add some initial validation logic.