Added a basic level of foolproofness.