Added extra check of the parameter names