diff --git a/src/config.py b/src/config.py
index 4562c463f2916921029310b17e9621fe6fe2f298..9fbfe8f5a5258ca27ab15477c178f56ef6366435 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 ae0f1474e9b8ac8ccda99a437df638ae9b1a51d5..1c75545afb001b90cb3594d56bfc9a3d179d69cc 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 eae459362947433c3dde297ab5c2d2aae202da3f..dd25c6257b3d3a26dd192e6820e0df754ab483dc 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 4dd082a5bfaec74d8be295bd31d5a5953650973f..8549309952221f2805d4a963a201100c7cd0559c 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 fdde6bc350ea985ed9e5ead6c8bb976ffe51d682..4be220b9c1e4467d90c38ab1bf027e58760d0ebb 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 9b2f6f9a5fe4b75c04b8a470ff34a50895a288a7..0be2d423e647bc898eddda99f5af5f8a7347eda5 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