diff --git a/pisi-cli b/pisi-cli
index 6ca202f6..762ff133 100755
--- a/pisi-cli
+++ b/pisi-cli
@@ -15,7 +15,6 @@ import locale
 import traceback
 import exceptions
 import signal
-import bsddb3.db as db
 
 import pisi.ui
 import pisi.context as ctx
@@ -44,10 +43,6 @@ def handle_exception(exception, value, tb):
     elif isinstance(value, pisi.Error):
         ui.error(_("Program Terminated."))
         show_traceback = ctx.get_option('debug')
-    elif isinstance(value, db.DBRunRecoveryError):
-        ui.error(_("""A database operation has been aborted. You should run pisi
-again for normal DB recovery procedure. Make sure you have free disk space. 
-You have to run rebuild-db only when there is file corruption and database upgrades."""))
     elif isinstance(value, pisi.Exception):
         show_traceback = True
         ui.error(_("""Unhandled internal exception.
diff --git a/pisi-cli2.5 b/pisi-cli2.5
index aaeea9d1..806b2bab 100755
--- a/pisi-cli2.5
+++ b/pisi-cli2.5
@@ -15,7 +15,6 @@ import locale
 import traceback
 import exceptions
 import signal
-import bsddb3.db as db
 
 import pisi.ui
 import pisi.context as ctx
@@ -39,10 +38,6 @@ def handle_exception(exception, value, tb):
     elif isinstance(value, pisi.Error):
         ui.error(_("Program Terminated."))
         show_traceback = ctx.get_option('debug')
-    elif isinstance(value, db.DBRunRecoveryError):
-        ui.error(_("""A database operation has been aborted. You should run pisi
-again for normal DB recovery procedure. Make sure you have free disk space. 
-You have to run rebuild-db only when there is file corruption and database upgrades."""))
     elif isinstance(value, pisi.Exception):
         show_traceback = True
         ui.error(_("""Unhandled internal exception.