diff --git a/plugins/MoobotFactoids.py b/plugins/MoobotFactoids.py
index cca49ca79..be578d7ba 100644
--- a/plugins/MoobotFactoids.py
+++ b/plugins/MoobotFactoids.py
@@ -155,10 +155,7 @@ class MoobotFactoids(callbacks.PrivmsgCommandAndRegexp):
 
     def die(self):
         # Handle DB stuff
-        db = self.dbHandler.getDb()
-        db.commit()
-        db.close()
-        del db
+        self.dbHandler.die()
 
     def _parseFactoid(self, irc, msg, fact):
         type = "define"  # Default is to just spit the factoid back as a
diff --git a/plugins/Note.py b/plugins/Note.py
index 0e3861e04..9cc1c2763 100644
--- a/plugins/Note.py
+++ b/plugins/Note.py
@@ -92,10 +92,7 @@ class Note(callbacks.Privmsg):
         db.commit()
 
     def die(self):
-        db = self.dbHandler.getDb()
-        db.commit()
-        db.close()
-        del db
+        self.dbHandler.die()
 
     def doPrivmsg(self, irc, msg):
         try:
diff --git a/src/plugins.py b/src/plugins.py
index 82845307e..b3e86ce68 100644
--- a/src/plugins.py
+++ b/src/plugins.py
@@ -99,6 +99,12 @@ class DBHandler(object):
             db = self.cachedDb
         db.autocommit = 1
         return db
+
+    def die(self):
+        if self.cachedDb is not None:
+            self.cachedDb.die()
+            del self.cachedDb
+        
         
 class ChannelDBHandler(object):
     """A class to handle database stuff for individual channels transparently.