diff --git a/deluge/ui/gtkui/ipcinterface.py b/deluge/ui/gtkui/ipcinterface.py
index 7ab2db059..222001c09 100644
--- a/deluge/ui/gtkui/ipcinterface.py
+++ b/deluge/ui/gtkui/ipcinterface.py
@@ -125,17 +125,19 @@ class IPCInterface(component.Component):
                 os.remove(f)
             lockfile = socket + ".lock"
             log.debug("Checking if lockfile exists: %s", lockfile)
-            if os.path.lexists(lockfile):
+            if os.path.lexists(lockfile) or os.path.lexists(socket):
                 try:
                     os.kill(int(os.readlink(lockfile)), 0)
                 except OSError:
                     log.debug("Removing lockfile since it's stale.")
                     try:
                         os.remove(lockfile)
+                    except OSError, ex:
+                        log.error("Failed to delete IPC lockfile file: %s", ex)
+                    try:
                         os.remove(socket)
-                    except Exception, e:
-                        log.error("Problem deleting lockfile or socket file!")
-                        log.exception(e)
+                    except OSError, ex:
+                        log.error("Failed to delete IPC socket file: %s", ex)
             try:
                 self.factory = Factory()
                 self.factory.protocol = IPCProtocolServer