Added some additional validation.