diff --git a/README b/README
index 851bca9d..f9334c29 100644
--- a/README
+++ b/README
@@ -1,7 +1,7 @@
 The Choose Your Own Adventure README for Nova:
 
   You have come across a cloud computing fabric controller.  It has identified
-  itself as "Nova."  It is apparent that it maintains compatability with
+  itself as "Nova."  It is apparent that it maintains compatibility with
   the popular Amazon EC2 and S3 APIs.
 
 To monitor it from a distance: follow @novacc on twitter
@@ -10,7 +10,7 @@ To tame it for use in your own cloud: read http://nova.openstack.org/getting.sta
 
 To study its anatomy: read http://nova.openstack.org/architecture.html
 
-To disect it in detail: visit http://code.launchpad.net/nova
+To dissect it in detail: visit http://code.launchpad.net/nova
 
 To taunt it with its weaknesses: use http://bugs.launchpad.net/nova
 
diff --git a/nova/tests/auth_unittest.py b/nova/tests/auth_unittest.py
index 32cb2c54..61ae43fb 100644
--- a/nova/tests/auth_unittest.py
+++ b/nova/tests/auth_unittest.py
@@ -335,11 +335,8 @@ class AuthManagerLdapTestCase(AuthManagerTestCase, test.TestCase):
         import nova.auth.fakeldap as fakeldap
         if FLAGS.flush_db:
             logging.info("Flushing datastore")
-            try:
-                r = fakeldap.Store.instance()
-                r.flushdb()
-            except:
-                self.skip = True
+            r = fakeldap.Store.instance()
+            r.flushdb()
 
 
 class AuthManagerDbTestCase(AuthManagerTestCase, test.TestCase):