diff --git a/src/config.py b/src/config.py
index 4562c463f..9fbfe8f5a 100644
--- a/src/config.py
+++ b/src/config.py
@@ -39,7 +39,7 @@ from common import gajim
 from common import connection
 from common import passwords
 
-from common.exceptions import GajimGeneralException as GajimGeneralException
+from common.exceptions import GajimGeneralException
 
 #---------- PreferencesWindow class -------------#
 class PreferencesWindow:
diff --git a/src/conversation_textview.py b/src/conversation_textview.py
index ae0f1474e..1c75545af 100644
--- a/src/conversation_textview.py
+++ b/src/conversation_textview.py
@@ -31,7 +31,7 @@ from calendar import timegm
 from common.fuzzyclock import FuzzyClock
 
 from htmltextview import HtmlTextView
-from common.exceptions import GajimGeneralException as GajimGeneralException
+from common.exceptions import GajimGeneralException
 
 class ConversationTextview:
 	'''Class for the conversation textview (where user reads already said messages)
diff --git a/src/dialogs.py b/src/dialogs.py
index eae459362..dd25c6257 100644
--- a/src/dialogs.py
+++ b/src/dialogs.py
@@ -40,7 +40,7 @@ from advanced import AdvancedConfigurationWindow
 
 from common import gajim
 from common import helpers
-from common.exceptions import GajimGeneralException as GajimGeneralException
+from common.exceptions import GajimGeneralException
 
 class EditGroupsDialog:
 	'''Class for the edit group dialog window'''
diff --git a/src/disco.py b/src/disco.py
index 4dd082a5b..854930995 100644
--- a/src/disco.py
+++ b/src/disco.py
@@ -49,7 +49,7 @@ import gtkgui_helpers
 
 from common import gajim
 from common import xmpp
-from common.exceptions import GajimGeneralException as GajimGeneralException
+from common.exceptions import GajimGeneralException
 
 # Dictionary mapping category, type pairs to browser class, image pairs.
 # This is a function, so we can call it after the classes are declared.
diff --git a/src/groupchat_control.py b/src/groupchat_control.py
index fdde6bc35..4be220b9c 100644
--- a/src/groupchat_control.py
+++ b/src/groupchat_control.py
@@ -39,7 +39,7 @@ from common import helpers
 from chat_control import ChatControl
 from chat_control import ChatControlBase
 from conversation_textview import ConversationTextview
-from common.exceptions import GajimGeneralException as GajimGeneralException
+from common.exceptions import GajimGeneralException
 
 #(status_image, type, nick, shown_nick)
 (
diff --git a/src/roster_window.py b/src/roster_window.py
index 9b2f6f9a5..0be2d423e 100644
--- a/src/roster_window.py
+++ b/src/roster_window.py
@@ -36,7 +36,7 @@ import notify
 from common import gajim
 from common import helpers
 from common import passwords
-from common.exceptions import GajimGeneralException as GajimGeneralException
+from common.exceptions import GajimGeneralException
 
 from message_window import MessageWindowMgr
 from chat_control import ChatControl