diff --git a/lib/discourse_ip_info.rb b/lib/discourse_ip_info.rb
index c2c72db9081..2514390a606 100644
--- a/lib/discourse_ip_info.rb
+++ b/lib/discourse_ip_info.rb
@@ -25,31 +25,35 @@ class DiscourseIpInfo
   end
 
   def self.mmdb_download(name)
-    FileUtils.mkdir_p(path)
+    begin
+      FileUtils.mkdir_p(path)
 
-    uri = URI("https://geolite.maxmind.com/download/geoip/database/#{name}.tar.gz")
+      uri = URI("https://geolite.maxmind.com/download/geoip/database/#{name}.tar.gz")
 
-    tar_gz_file = Tempfile.new
-    tar_gz_file.binmode
-    tar_gz_file.write(Net::HTTP.get(uri))
-    tar_gz_file.close
+      tar_gz_file = Tempfile.new
+      tar_gz_file.binmode
+      tar_gz_file.write(Net::HTTP.get(uri))
+      tar_gz_file.close
 
-    dest = File.join(Dir.tmpdir, "maxmind_#{SecureRandom.hex}")
-    FileUtils.mkdir_p(dest)
+      dest = File.join(Dir.tmpdir, "maxmind_#{SecureRandom.hex}")
+      FileUtils.mkdir_p(dest)
 
-    Discourse::Utils.execute_command('tar', '-xzvf', tar_gz_file.path, "-C", dest)
+      Discourse::Utils.execute_command('tar', '-xzvf', tar_gz_file.path, "-C", dest)
 
-    Dir.glob("#{dest}/**/*.mmdb").each do |path|
-      if path.include?(name)
-        FileUtils.mv(path, mmdb_path(name))
-      else
-        Rails.logger.warn("Skipping unknown mmdb file during ip database update #{path}")
+      Dir.glob("#{dest}/**/*.mmdb").each do |path|
+        if path.include?(name)
+          FileUtils.mv(path, mmdb_path(name))
+        else
+          Rails.logger.warn("Skipping unknown mmdb file during ip database update #{path}")
+        end
       end
-    end
 
-  ensure
-    FileUtils.rm_rf(dest) if dest
-    FileUtils.rm(tar_gz_file) if tar_gz_file
+    rescue => e
+      Rails.logger.warn("There was an error downloading MaxMindDB (#{name}): #{e}")
+    ensure
+      FileUtils.rm_rf(dest) if dest
+      FileUtils.rm(tar_gz_file) if tar_gz_file
+    end
   end
 
   def mmdb_load(filepath)