diff --git a/lib/rmt/fiber_request.rb b/lib/rmt/fiber_request.rb
index 5987cef28..4ce4fc509 100644
--- a/lib/rmt/fiber_request.rb
+++ b/lib/rmt/fiber_request.rb
@@ -17,6 +17,7 @@ def initialize(base_url, download_path:, request_fiber:, remote_file:, **options
       @download_path.write(chunk)
     end
     on_complete do |response|
+      @request_fiber.resume(response) unless response.return_code == :ok # otherwise skips on_headers resume when the request has failed
       @request_fiber.resume(response) if @request_fiber.alive?
     end
   end
diff --git a/package/rmt-server.changes b/package/rmt-server.changes
index 418b1eb71..d646213bd 100644
--- a/package/rmt-server.changes
+++ b/package/rmt-server.changes
@@ -1,3 +1,9 @@
+-------------------------------------------------------------------
+Thu Sep 27 15:35:29 UTC 2018 - ikapelyukhin@suse.com
+
+- Improved exception handling when HTTP request fails due to
+  a network or SSL validity issue
+
 -------------------------------------------------------------------
 Thu Aug  2 16:19:35 UTC 2018 - fschnizlein@suse.com