diff --git a/src/jmc/jabber/tests/component.py b/src/jmc/jabber/tests/component.py
index ce6306f..e2babf6 100644
--- a/src/jmc/jabber/tests/component.py
+++ b/src/jmc/jabber/tests/component.py
@@ -842,13 +842,13 @@ class MailHandler_TestCase(unittest.TestCase):
                           to_jid="user2%test.com@jcl.test.com",
                           body="message")
         try:
-           accounts = self.handler.filter(message, None)
+            accounts = self.handler.filter(message, None)
+            model.db_disconnect()
         except NoAccountError, e:
-           self.assertNotEquals(e, None)
-           return
-        finally:
-           model.db_disconnect()
-        self.fail("No exception 'NoAccountError' catched")
+            model.db_disconnect()
+            self.assertNotEquals(e, None)
+        else:
+            self.fail("No exception 'NoAccountError' catched")
 
 class MailPresenceHandler_TestCase(unittest.TestCase):
     def setUp(self):