diff --git a/system-config-printer-npinit-traceback.patch b/system-config-printer-npinit-traceback.patch
new file mode 100644
index 0000000..dc111de
--- /dev/null
+++ b/system-config-printer-npinit-traceback.patch
@@ -0,0 +1,12 @@
+diff -up system-config-printer-1.1.16/system-config-printer.py.npinit-traceback system-config-printer-1.1.16/system-config-printer.py
+--- system-config-printer-1.1.16/system-config-printer.py.npinit-traceback	2010-01-06 15:38:44.618286232 +0000
++++ system-config-printer-1.1.16/system-config-printer.py	2010-01-06 15:38:54.800408801 +0000
+@@ -3974,7 +3974,7 @@ class NewPrinterGUI(GtkGUI):
+                     self.auto_make = devid_dict["MFG"]
+                     self.auto_model = devid_dict["MDL"]
+                     self.auto_driver = None
+-                if not self.device or not self.device.id:
++                if self.device and not self.device.id:
+                     self.device.id = devid
+                     self.device.id_dict = cupshelpers.parseDeviceID (devid)
+                 self.mainapp.devid = ""
diff --git a/system-config-printer.spec b/system-config-printer.spec
index d8ba832..7cb8a85 100644
--- a/system-config-printer.spec
+++ b/system-config-printer.spec
@@ -20,6 +20,7 @@ Patch2: system-config-printer-typo.patch
 Patch3: system-config-printer-driver-pre-selection.patch
 Patch4: system-config-printer-foomatic-recommended.patch
 Patch5: system-config-printer-jobviewer-exit.patch
+Patch6: system-config-printer-npinit-traceback.patch
 
 BuildRequires: cups-devel >= 1.2
 BuildRequires: python-devel >= 2.4
@@ -84,6 +85,7 @@ printers.
 %patch3 -p1 -b .driver-pre-selection
 %patch4 -p1 -b .foomatic-recommended
 %patch5 -p1 -b .jobviewer-exit
+%patch6 -p1 -b .npinit-traceback
 
 %build
 %configure --with-udev-rules --with-polkit-1
@@ -201,6 +203,7 @@ exit 0
 
 %changelog
 * Wed Jan  6 2010 Tim Waugh <twaugh@redhat.com> - 1.1.16-3
+- Avoid traceback in NewPrinterGUI.init (bug #550442).
 - Avoid traceback in on_jobviewer_exit (bug #550437).
 
 * Wed Dec 23 2009 Tim Waugh <twaugh@redhat.com> - 1.1.16-2