client listener NPE fix