diff --git a/deluge/common.py b/deluge/common.py
index 92648bec3..c32238f3c 100644
--- a/deluge/common.py
+++ b/deluge/common.py
@@ -695,7 +695,7 @@ class VersionSplit(object):
     def __init__(self, ver):
         ver = ver.lower()
         vs = ver.replace("_", "-").split("-")
-        self.version = [int(x) for x in vs[0].split(".")]
+        self.version = [int(x) for x in vs[0].split(".") if x.isdigit()]
         self.suffix = None
         self.dev = False
         if len(vs) > 1:
diff --git a/deluge/core/core.py b/deluge/core/core.py
index fd2d4e5ec..92c6defce 100644
--- a/deluge/core/core.py
+++ b/deluge/core/core.py
@@ -80,7 +80,7 @@ class Core(component.Component):
         log.info("Starting libtorrent %s session..", lt.version)
 
         # Create the client fingerprint
-        version = [int(value.split("-")[0]) for value in deluge.common.get_version().split(".")]
+        version = deluge.common.VersionSplit(deluge.common.get_version()).version
         while len(version) < 4:
             version.append(0)