Better validation of generator form