Error proofing
Merge pull request #50 from paradigm/master

Error proofing