diff --git a/src/common/optparser.py b/src/common/optparser.py
index 1268f9233..8b8adb4e2 100644
--- a/src/common/optparser.py
+++ b/src/common/optparser.py
@@ -270,6 +270,7 @@ class OptionsParser:
 
 	def update_config_to_01012(self):
 		# See [6456]
-		if self.old_values['emoticons_theme'] == 'Disabled':
+		if self.old_values.has_key('emoticons_theme') and \
+			self.old_values['emoticons_theme'] == 'Disabled':
 			gajim.config.set('emoticons_theme', '')
 		gajim.config.set('version', '0.10.1.2')