diff --git a/udev-discover.in b/udev-discover.in
index fec8b4e..6d194fc 100644
--- a/udev-discover.in
+++ b/udev-discover.in
@@ -458,10 +458,10 @@ class UDevDiscoverGUI(GConfStore):
device = self.device_finder.get_devices_tree()[row[PATH_COL]]
title = ''+device.nice_label+''
- if hasattr(device, 'vendor_name'):
- title += '\n%s' % device.vendor_name
- if hasattr(device, 'model_name'):
- title += '\n%s' % device.model_name
+ if hasattr(device, 'vendor_name') and device.vendor_name:
+ title += '\n%s' % device.vendor_name.decode('UTF-8')
+ if hasattr(device, 'model_name') and device.model_name:
+ title += '\n%s' % device.model_name.decode('UTF-8')
self.devicename_label.set_label(title)
desc = '\n'.join([': '.join((''+key.capitalize()+'',