ENG-5661 (passed jenkins) avoid wrong error message when too few params meets client affi...

...nity checking