diff --git a/deluge/common.py b/deluge/common.py
index 463c5f90b..76344cb09 100644
--- a/deluge/common.py
+++ b/deluge/common.py
@@ -30,10 +30,10 @@ import time
 import subprocess
 import platform
 import sys
-	
-if sys.version_info > (2, 6):
+
+try:
     import json
-else:
+except ImportError:
     import simplejson as json
 
 import pkg_resources
diff --git a/deluge/ui/common.py b/deluge/ui/common.py
index d88eb007a..56f2ef5fa 100644
--- a/deluge/ui/common.py
+++ b/deluge/ui/common.py
@@ -25,10 +25,11 @@
 import os
 import sys
 
-if sys.version_info > (2, 6):
+try:
     from hashlib import sha1 as sha
-else:
+except ImportError:
     from sha import sha
+
 import urlparse
 
 from deluge import bencode
diff --git a/deluge/ui/gtkui/filtertreeview.py b/deluge/ui/gtkui/filtertreeview.py
index b51ae352d..a0659c66d 100644
--- a/deluge/ui/gtkui/filtertreeview.py
+++ b/deluge/ui/gtkui/filtertreeview.py
@@ -241,7 +241,7 @@ class FilterTreeView(component.Component):
         try: #assume we could get trashed images here..
             pix = gtk.gdk.pixbuf_new_from_file_at_size(filename, 16, 16)
         except Exception, e:
-            log.debug(e.message)
+            log.debug(e)
 
         if not pix:
             pix = gtk.gdk.Pixbuf(gtk.gdk.COLORSPACE_RGB, True, 8, 16, 16)
diff --git a/deluge/ui/tracker_icons.py b/deluge/ui/tracker_icons.py
index 6fd4fa7e6..40bdc14cc 100644
--- a/deluge/ui/tracker_icons.py
+++ b/deluge/ui/tracker_icons.py
@@ -55,7 +55,7 @@ def fetch_url(url, valid_subtypes=None):
         if not data:
             raise Exception("No data")
     except Exception, e:
-        log.debug("%s %s %s" % (url, e, e.message))
+        log.debug("%s %s" % (url, e))
         return None
 
     return data