Port change for Bug #33122 to current 1.3 version - unchecked exception when paramId value already in the params map reported by Uwe Voigt
Changed paths: