diff --git a/CHANGELOG.rst b/CHANGELOG.rst
index b42f9bad..311693f9 100644
--- a/CHANGELOG.rst
+++ b/CHANGELOG.rst
@@ -1,3 +1,12 @@
+2.0.2
+=====
+
+Bug Fixes
+---------
+* Add six to requirements.txt
+* Avoid KeyError during schema refresh when a keyspace is dropped
+  and TokenAwarePolicy is not in use
+
 2.0.1
 =====
 May 28, 2014
diff --git a/cassandra/metadata.py b/cassandra/metadata.py
index 9597c418..3e3807ce 100644
--- a/cassandra/metadata.py
+++ b/cassandra/metadata.py
@@ -970,7 +970,7 @@ class TokenMap(object):
             return None
 
     def remove_keyspace(self, keyspace):
-        del self.tokens_to_hosts_by_ks[keyspace]
+        self.tokens_to_hosts_by_ks.pop(keyspace, None)
 
     def get_replicas(self, keyspace, token):
         """