Fixes #450 : OOME on client authentication failure
Merge pull request #562 from pveentjer/fix/2.x/oome-client-authentication-failure

Fixes #450 : OOME on client authentication failure