diff --git a/deluge/core/core.py b/deluge/core/core.py
index 73faac6aa..15a7d0c24 100644
--- a/deluge/core/core.py
+++ b/deluge/core/core.py
@@ -165,9 +165,10 @@ class Core(
         # Load the session state if available
         self.load_session_state()
 
-        # Load the GeoIP DB for country look-ups
-        self.session.load_country_db(
-            pkg_resources.resource_filename("deluge", os.path.join("data", "GeoIP.dat")))
+        # Load the GeoIP DB for country look-ups if available
+        geoip_db = pkg_resources.resource_filename("deluge", os.path.join("data", "GeoIP.dat"))
+        if os.path.exists(geoip_db):
+            self.session.load_country_db(geoip_db)
 
         # Set the user agent
         self.settings = lt.session_settings()
diff --git a/setup.py b/setup.py
index fa401940c..32738e4ab 100644
--- a/setup.py
+++ b/setup.py
@@ -344,7 +344,7 @@ setup(
     author = "Andrew Resch, Marcos Pinto, Martijn Voncken, Sadrul Habib Chowdhury",
     author_email = "andrewresch@gmail.com, markybob@dipconsultants.com, \
         mvoncken@gmail.com, sadrul@users.sourceforge.net",
-    cmdclass=cmdclass,
+    cmdclass = cmdclass,
     data_files = _data_files,
     description = "Bittorrent Client",
     entry_points = """