don't add client info if client is None (which it really shouldnt be..ever)