diff --git a/src/gajim.py b/src/gajim.py
index d191f03fa51fb5c25e5ed590138f3eff8ef72a22..ba6cc52ea9aa729935e4abad8e8ab7c99ab946b2 100755
--- a/src/gajim.py
+++ b/src/gajim.py
@@ -1335,9 +1335,7 @@ if __name__ == '__main__':
 			import gconf
 			# in try because daemon may not be there
 			client = gconf.client_get_default()
-		except:
-			pass
-		else:
+		
 			we_set = False
 			if gajim.config.get('set_xmpp://_handler_everytime'):
 				we_set = True
@@ -1355,6 +1353,8 @@ if __name__ == '__main__':
 					client.set_bool('/desktop/gnome/url-handlers/xmpp/enabled', True)
 					client.set_string('/desktop/gnome/url-handlers/xmpp/command', command)
 					client.set_bool('/desktop/gnome/url-handlers/xmpp/needs_terminal', False)
+		except:
+			pass
 	
 	Interface()
 	gtk.main()
diff --git a/src/gtkgui_helpers.py b/src/gtkgui_helpers.py
index aef73d4179f000598737a68b73dc6a132f036a7e..7d47dcbac764de41274c83c7d0d233eaf8a12fa0 100644
--- a/src/gtkgui_helpers.py
+++ b/src/gtkgui_helpers.py
@@ -57,11 +57,11 @@ def get_default_font():
 		import gconf
 		# in try because daemon may not be there
 		client = gconf.client_get_default()
-	except:
-		pass
-	else:
+
 		return helpers.ensure_unicode_string(
 			client.get_string('/desktop/gnome/interface/font_name'))
+	except:
+		pass
 
 	# try to get xfce default font
 	# Xfce 4.2 adopts freedesktop.org's Base Directory Specification