diff --git a/lib/geocoder/exceptions.rb b/lib/geocoder/exceptions.rb
index 280b9dd0463664dd38492d104d7449b3b01d9aa4..228c45b3a91739d311c341d0078e14c2beb02894 100644
--- a/lib/geocoder/exceptions.rb
+++ b/lib/geocoder/exceptions.rb
@@ -34,4 +34,7 @@ module Geocoder
   class LookupTimeout < ::Timeout::Error
   end
 
+  class NetworkError < Error
+  end
+
 end
diff --git a/lib/geocoder/lookups/base.rb b/lib/geocoder/lookups/base.rb
index ed9b946be095175856a0d7f3ff98c8737712e531..e1db39805f7f060a434d9764bf74d09bd87ac6b1 100644
--- a/lib/geocoder/lookups/base.rb
+++ b/lib/geocoder/lookups/base.rb
@@ -286,6 +286,8 @@ module Geocoder
         end
       rescue Timeout::Error
         raise Geocoder::LookupTimeout
+      rescue Errno::EHOSTUNREACH, Errno::ETIMEDOUT, Errno::ENETUNREACH
+        raise Geocoder::NetworkError
       end
 
       def use_ssl?
diff --git a/test/test_helper.rb b/test/test_helper.rb
index 00055c80748ca686fd5277c83bff2f6fbf189cc9..89aa2bef97f4884b047a70375bc5441efe77833b 100644
--- a/test/test_helper.rb
+++ b/test/test_helper.rb
@@ -129,6 +129,7 @@ module Geocoder
         raise Timeout::Error if query.text == "timeout"
         raise SocketError if query.text == "socket_error"
         raise Errno::ECONNREFUSED if query.text == "connection_refused"
+        raise Errno::EHOSTUNREACH if query.text == "host_unreachable"
         if query.text == "invalid_json"
           return MockHttpResponse.new(:body => 'invalid json', :code => 200)
         end
diff --git a/test/unit/error_handling_test.rb b/test/unit/error_handling_test.rb
index 2052b0331e580f1cda62513060a3f3228188fadb..ca20f3e5e40caa3e0bd1118e3b490c86219d0070 100644
--- a/test/unit/error_handling_test.rb
+++ b/test/unit/error_handling_test.rb
@@ -75,4 +75,16 @@ class ErrorHandlingTest < GeocoderTestCase
       end
     end
   end
+
+  def test_always_raise_host_unreachable_error
+    Geocoder.configure(:always_raise => [Errno::EHOSTUNREACH])
+    Geocoder::Lookup.all_services_except_test.each do |l|
+      next if l == :maxmind_local || l == :geoip2 # local, does not use cache
+      lookup = Geocoder::Lookup.get(l)
+      set_api_key!(l)
+      assert_raises Errno::EHOSTUNREACH do
+        lookup.send(:results, Geocoder::Query.new("host_unreachable"))
+      end
+    end
+  end
 end