Fixing client npe.