diff --git a/pydle/client.py b/pydle/client.py
index b11a4f7..1ffdc3c 100644
--- a/pydle/client.py
+++ b/pydle/client.py
@@ -226,7 +226,7 @@ class BasicClient:
         raise NotImplementedError()
 
     def _format_user_mask(self, nickname):
-        user = self.users.get(nickname, { "username": "*", "hostname": "*" })
+        user = self.users.get(nickname, { "nickname": nickname, "username": "*", "hostname": "*" })
         return self._format_host_mask(user['nickname'], user['username'] or '*', user['hostname'] or '*')
 
     def _format_host_mask(self, nick, user, host):
diff --git a/pydle/features/account.py b/pydle/features/account.py
index e16b7e7..537271e 100644
--- a/pydle/features/account.py
+++ b/pydle/features/account.py
@@ -7,6 +7,10 @@ class AccountSupport(rfc1459.RFC1459Support):
     ## Internal.
 
     def _create_user(self, nickname):
+        # Servers aren't users here, either!
+        if "." in nickname:
+            return
+
         super()._create_user(nickname)
         self.users[nickname].update({
             'account': None,
diff --git a/pydle/features/tls.py b/pydle/features/tls.py
index 933e40b..f2a08cd 100644
--- a/pydle/features/tls.py
+++ b/pydle/features/tls.py
@@ -96,7 +96,7 @@ class TLSSupport(rfc1459.RFC1459Support):
             'secure': True
         }
 
-        if nickname in self._pending['whois']:
+        if nickname in self._whois_info:
             self._whois_info[nickname].update(info)
 
     def on_raw_691(self, message):