--- /usr/share/system-config-printer/system-config-printer.py.orig	2009-09-25 17:07:46.000000000 +0200
+++ /usr/share/system-config-printer/system-config-printer.py	2009-09-25 17:32:01.000000000 +0200
@@ -3555,6 +3555,7 @@
         self.options = {} # keyword -> Option object
         self.changed = set()
         self.conflicts = set()
+        self.device = None
         self.ppd = None
         self.remotecupsqueue = False
         self.exactdrivermatch = False
@@ -3905,7 +3906,7 @@
                 except:
                     self.auto_make = devid_dict["MFG"]
                     self.auto_model = devid_dict["MDL"]
-                if not self.device.id:
+                if not self.device or not self.device.id:
                     self.device.id = devid
                     self.device.id_dict = \
                         cupshelpers.parseDeviceID (self.device.id)
@@ -6236,7 +6237,7 @@
 
         # Also pre-fill the OpenPrinting.org search box.
         search = ''
-        if self.device.id_dict:
+        if self.device and self.device.id_dict:
             devid_dict = self.device.id_dict
             if devid_dict["MFG"] and devid_dict["MDL"]:
                 search = devid_dict["MFG"] + " " + devid_dict["MDL"]