client listener NPE fix
Merge pull request #1758 from gurbuzali/client-listener-npe-fix/3.x-master

client listener NPE fix