Validate a little nicer