diff --git a/plugins/gtkgui/config.py b/plugins/gtkgui/config.py
index 65e230995af3f27e0beba67a04fa54187e69a223..c8e24e90ad8b3e1970c37a40b601fdd0a85ae351 100644
--- a/plugins/gtkgui/config.py
+++ b/plugins/gtkgui/config.py
@@ -764,7 +764,7 @@ class agentRegistration_Window:
 		for name in self.entries.keys():
 			self.infos[name] = self.entries[name].get_text()
 		user1 = gtkgui.user(self.agent, self.agent, ['Agents'], 'offline', 'offline', \
-			'from', '', 0)
+			'from', '', 0, '')
 		self.plugin.roster.contacts[self.account][self.agent] = [user1]
 		self.plugin.roster.add_user_to_roster(self.agent, self.account)
 		self.plugin.send('REG_AGENT', self.account, self.agent)
diff --git a/plugins/gtkgui/gtkgui.py b/plugins/gtkgui/gtkgui.py
index 75585c0801bc4d6773eff7661d4d638a4e2af274..a4a362c4304bdc1ed186fdc1ffe981ae2830d24e 100644
--- a/plugins/gtkgui/gtkgui.py
+++ b/plugins/gtkgui/gtkgui.py
@@ -2424,11 +2424,13 @@ class plugin:
 			iconstyle = 'sun'
 		path = 'plugins/gtkgui/icons/' + iconstyle + '/'
 		files = [path + 'online.gif', path + 'online.png', path + 'online.xpm']
+		pix = None
 		for file in files:
 			if os.path.exists(file):
 				pix = gtk.gdk.pixbuf_new_from_file(file)
 				break
-		gtk.window_set_default_icon(pix)
+		if pix:
+			gtk.window_set_default_icon(pix)
 		self.roster = roster_Window(self)
 		gtk.timeout_add(100, self.read_queue)
 		gtk.timeout_add(1000, self.read_sleepy)