Add in some extra validation checks