Improved Generator validation.