diff --git a/deluge/ui/common.py b/deluge/ui/common.py
index 1f0d2e5b3..f0a5c5603 100644
--- a/deluge/ui/common.py
+++ b/deluge/ui/common.py
@@ -24,7 +24,10 @@
 
 
 import os
-from sha import sha
+try:
+    from hashlib import sha1 as sha
+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 cf1dce421..9643f0885 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)