Added error checking.
Merge branch 'master' of github.com:hcayless/formX