From c1583dd7d6ce1402257d31b918c68c9be62431d0 Mon Sep 17 00:00:00 2001
From: Rapptz <Rapptz@gmail.com>
Date: Wed, 6 Jan 2016 12:57:09 -0500
Subject: [PATCH] Unavailable guilds get added to cache.

---
 discord/server.py | 4 ++--
 discord/state.py  | 2 --
 2 files changed, 2 insertions(+), 4 deletions(-)

diff --git a/discord/server.py b/discord/server.py
index 2ef828321..e04049be8 100644
--- a/discord/server.py
+++ b/discord/server.py
@@ -115,9 +115,9 @@ class Server(Hashable):
         self.icon = guild.get('icon')
         self.unavailable = guild.get('unavailable', False)
         self.id = guild['id']
-        self.roles = [Role(everyone=(self.id == r['id']), **r) for r in guild['roles']]
+        self.roles = [Role(everyone=(self.id == r['id']), **r) for r in guild.get('roles', [])]
 
-        owner_id = guild['owner_id']
+        owner_id = guild.get('owner_id')
 
         for data in guild.get('members', []):
             roles = [self.default_role]
diff --git a/discord/state.py b/discord/state.py
index 8b6fc0c44..06ec6ffb1 100644
--- a/discord/state.py
+++ b/discord/state.py
@@ -67,8 +67,6 @@ class ConnectionState:
         guilds = data.get('guilds')
 
         for guild in guilds:
-            if guild.get('unavailable', False):
-                continue
             self._add_server(guild)
 
         for pm in data.get('private_channels'):