Error Checking

Finished most error checking. Have to add invalid class/criteria name
error checking