diff --git a/lib/common/db_updater.rb b/lib/common/db_updater.rb
index a40a7b09..3a2b3030 100644
--- a/lib/common/db_updater.rb
+++ b/lib/common/db_updater.rb
@@ -36,7 +36,7 @@ class DbUpdater
     url = "#{remote_file_url(filename)}.sha512"
 
     res = Browser.get(url, request_params)
-    fail DownloadError, res unless res.code == 200
+    fail DownloadError, res if res.timed_out? || res.code != 200
     res.body
   end
 
@@ -72,7 +72,7 @@ class DbUpdater
     file_url  = remote_file_url(filename)
 
     res = Browser.get(file_url, request_params)
-    fail DownloadError, res unless res.code == 200
+    fail DownloadError, res if res.timed_out? || res.code != 200
     File.open(file_path, 'wb') { |f| f.write(res.body) }
 
     local_file_checksum(filename)
diff --git a/lib/common/errors.rb b/lib/common/errors.rb
index 29087e95..2a353d45 100644
--- a/lib/common/errors.rb
+++ b/lib/common/errors.rb
@@ -10,7 +10,13 @@ class HttpError < StandardError
 
   def failure_details
     msg = response.effective_url
-    msg += response.code == 0 ? " (#{response.return_message})" : " (status: #{response.code})"
+
+    if response.code == 0 || response.timed_out?
+      msg += " (#{response.return_message})"
+    else
+      msg += " (status: #{response.code})"
+    end
+
     msg
   end