From 29b01f20baf8a5bd1f73db083ba0f8fb5da687a6 Mon Sep 17 00:00:00 2001
From: Khazhismel Kumykov <khazhy@gmail.com>
Date: Fri, 29 Apr 2016 15:12:05 -0400
Subject: [PATCH] Fix Member.display_name returning None

If Member.nick was None, getattr would happily return None, not the
default value.
---
 discord/user.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/discord/user.py b/discord/user.py
index ce68775f6..c05d9aa1d 100644
--- a/discord/user.py
+++ b/discord/user.py
@@ -133,5 +133,5 @@ class User:
         if they have a server specific nickname then that
         is returned instead.
         """
-        return getattr(self, 'nick', self.name)
+        return getattr(self, 'nick', None) or self.name