Add in some basic validation checks