add some idiot proofing