Add an extra safety check to ParameterSet