diff --git a/system-config-printer-troubleshooter-traceback.patch b/system-config-printer-troubleshooter-traceback.patch
new file mode 100644
index 0000000..da5ced1
--- /dev/null
+++ b/system-config-printer-troubleshooter-traceback.patch
@@ -0,0 +1,47 @@
+diff -up system-config-printer-1.1.15/troubleshoot/__init__.py.troubleshooter-traceback system-config-printer-1.1.15/troubleshoot/__init__.py
+--- system-config-printer-1.1.15/troubleshoot/__init__.py.troubleshooter-traceback	2009-09-30 09:35:12.000000000 +0100
++++ system-config-printer-1.1.15/troubleshoot/__init__.py	2009-12-07 15:01:03.200971984 +0000
+@@ -178,6 +178,7 @@ class Troubleshooter:
+         return text.rstrip () + '\n'
+ 
+     def busy (self):
++        self._in_module_call = True
+         self.forward.set_sensitive (False)
+         self.back.set_sensitive (False)
+         gdkwin = self.get_window ().window
+@@ -187,6 +188,7 @@ class Troubleshooter:
+                 gtk.main_iteration ()
+ 
+     def ready (self):
++        self._in_module_call = False
+         gdkwin = self.get_window ().window
+         if gdkwin:
+             gdkwin.set_cursor (gtk.gdk.Cursor (gtk.gdk.LEFT_PTR))
+@@ -291,13 +293,11 @@ class Troubleshooter:
+ 
+     def _display (self, question):
+         result = False
+-        self._in_module_call = True
+         try:
+             result = question.display ()
+         except:
+             self._report_traceback ()
+ 
+-        self._in_module_call = False
+         question.displayed = result
+         return result
+ 
+@@ -310,13 +310,11 @@ class Troubleshooter:
+ 
+     def _collect_answer (self, question):
+         answer = {}
+-        self._in_module_call = True
+         try:
+             answer = question.collect_answer ()
+         except:
+             self._report_traceback ()
+ 
+-        self._in_module_call = False
+         return answer
+ 
+ QUESTIONS = ["Welcome",
diff --git a/system-config-printer.spec b/system-config-printer.spec
index 261bcf9..d5480de 100644
--- a/system-config-printer.spec
+++ b/system-config-printer.spec
@@ -7,7 +7,7 @@
 Summary: A printer administration tool
 Name: system-config-printer
 Version: 1.1.15
-Release: 3%{?dist}
+Release: 4%{?dist}
 License: GPLv2+
 URL: http://cyberelk.net/tim/software/system-config-printer/
 Group: System Environment/Base
@@ -19,6 +19,7 @@ Patch1: system-config-printer-no-epydoc.patch
 Patch2: system-config-printer-localize-statereason.patch
 Patch3: system-config-printer-browsepoll.patch
 Patch4: system-config-printer-cupsd.conf-parser.patch
+Patch5: system-config-printer-troubleshooter-traceback.patch
 
 BuildRequires: cups-devel >= 1.2
 BuildRequires: python-devel >= 2.4
@@ -82,6 +83,7 @@ printers.
 %patch2 -p1 -b .localize-statereason
 %patch3 -p1 -b .browsepoll
 %patch4 -p1 -b .cupsd.conf-parser
+%patch5 -p1 -b .troubleshooter-traceback
 
 %build
 %configure --with-udev-rules --with-polkit-1
@@ -194,6 +196,9 @@ rm -rf %buildroot
 exit 0
 
 %changelog
+* Mon Dec  7 2009 Tim Waugh <twaugh@redhat.com> - 1.1.15-4
+- Fixed traceback when troubleshooter operation is cancelled (bug #544356).
+
 * Thu Dec  3 2009 Tim Waugh <twaugh@redhat.com> - 1.1.15-3
 - Fixed cupsd.conf parsing when lines begin with blanks (bug #544003).
 - Don't overwrite BrowsePoll settings in basic settings dialog (bug #543986).