diff --git a/pisi-cli b/pisi-cli
index 86f303c1..a6eb158c 100755
--- a/pisi-cli
+++ b/pisi-cli
@@ -43,7 +43,6 @@ def handle_exception(exception, value, tb):
         exit()
     elif isinstance(value, pisi.Error):
         ui.error(_("Program terminated."))
-        show_traceback = ctx.get_option('debug')
     elif isinstance(value, pisi.Exception):
         show_traceback = True
         ui.error(_("Unhandled internal exception.\n"
@@ -64,9 +63,8 @@ def handle_exception(exception, value, tb):
     if show_traceback:
         ui.info(_("\nTraceback:"))
         traceback.print_tb(tb)
-    else:
-        if not exception is pisi.Error:
-            ui.info(_("Use --debug to see a traceback."))
+    elif not isinstance(value, pisi.Error):
+        ui.info(_("Use --debug to see a traceback."))
 
     exit()
 
diff --git a/pisi/atomicoperations.py b/pisi/atomicoperations.py
index 00ea3c21..2ee59da9 100644
--- a/pisi/atomicoperations.py
+++ b/pisi/atomicoperations.py
@@ -405,7 +405,7 @@ class Install(AtomicOperation):
             if missing_old_files:
                 ctx.ui.warning(_("Unable to relocate following files. Reinstallation of this package is strongly recommended."))
                 for f in sorted(missing_old_files):
-                    ctx.ui.warning("\t- %s" % f)
+                    ctx.ui.warning("    - %s" % f)
 
         # remove left over files from the old package.
         def clean_leftovers():