diff --git a/src/Ocelot/Errors/OcelotErrorCode.cs b/src/Ocelot/Errors/OcelotErrorCode.cs
index d8b6f333..6ca67e7d 100644
--- a/src/Ocelot/Errors/OcelotErrorCode.cs
+++ b/src/Ocelot/Errors/OcelotErrorCode.cs
@@ -39,6 +39,7 @@
         CannotAddPlaceholderError = 34,
         CannotRemovePlaceholderError = 35,
         QuotaExceededError = 36,
-        RequestCanceled = 37,
+        RequestCanceled = 37,
+        ConnectionToDownstreamServiceError = 38,
     }
 }
diff --git a/src/Ocelot/Requester/ConnectionToDownstreamServiceError.cs b/src/Ocelot/Requester/ConnectionToDownstreamServiceError.cs
new file mode 100644
index 00000000..d2087983
--- /dev/null
+++ b/src/Ocelot/Requester/ConnectionToDownstreamServiceError.cs
@@ -0,0 +1,13 @@
+using Ocelot.Errors;
+using System;
+
+namespace Ocelot.Requester
+{
+    class ConnectionToDownstreamServiceError : Error
+    {
+        public ConnectionToDownstreamServiceError(Exception exception)
+            : base($"Error connecting to downstream service, exception: {exception}", OcelotErrorCode.ConnectionToDownstreamServiceError)
+        {
+        }
+    }
+}
diff --git a/src/Ocelot/Requester/HttpExeptionToErrorMapper.cs b/src/Ocelot/Requester/HttpExeptionToErrorMapper.cs
index 100d01f4..80cec0ea 100644
--- a/src/Ocelot/Requester/HttpExeptionToErrorMapper.cs
+++ b/src/Ocelot/Requester/HttpExeptionToErrorMapper.cs
@@ -4,6 +4,8 @@ namespace Ocelot.Requester
     using Microsoft.Extensions.DependencyInjection;
     using System;
     using System.Collections.Generic;
+    using System.Net.Http;
+    using System.Net.Sockets;
 
     public class HttpExeptionToErrorMapper : IExceptionToErrorMapper
     {
@@ -28,6 +30,11 @@ namespace Ocelot.Requester
                 return new RequestCanceledError(exception.Message);
             }
 
+            if (type == typeof(HttpRequestException))
+            {
+                return new ConnectionToDownstreamServiceError(exception);
+            }
+
             return new UnableToCompleteRequestError(exception);
         }
     }
diff --git a/src/Ocelot/Responder/ErrorsToHttpStatusCodeMapper.cs b/src/Ocelot/Responder/ErrorsToHttpStatusCodeMapper.cs
index 718f4e3b..6b0ee6cc 100644
--- a/src/Ocelot/Responder/ErrorsToHttpStatusCodeMapper.cs
+++ b/src/Ocelot/Responder/ErrorsToHttpStatusCodeMapper.cs
@@ -38,11 +38,16 @@ namespace Ocelot.Responder
             if (errors.Any(e => e.Code == OcelotErrorCode.UnableToFindDownstreamRouteError))
             {
                 return 404;
+            }
+
+            if (errors.Any(e => e.Code == OcelotErrorCode.ConnectionToDownstreamServiceError))
+            {
+                return 502;
             }
 
             if (errors.Any(e => e.Code == OcelotErrorCode.UnableToCompleteRequestError))
             {
-                return 502;
+                return 500;
             }
 
             return 404;
diff --git a/test/Ocelot.AcceptanceTests/SslTests.cs b/test/Ocelot.AcceptanceTests/SslTests.cs
index 800f1e43..a0ea17a4 100644
--- a/test/Ocelot.AcceptanceTests/SslTests.cs
+++ b/test/Ocelot.AcceptanceTests/SslTests.cs
@@ -89,7 +89,7 @@ namespace Ocelot.AcceptanceTests
                 .And(x => _steps.GivenThereIsAConfiguration(configuration))
                 .And(x => _steps.GivenOcelotIsRunning())
                 .When(x => _steps.WhenIGetUrlOnTheApiGateway("/"))
-                .Then(x => _steps.ThenTheStatusCodeShouldBe(HttpStatusCode.BadGateway))
+                .Then(x => _steps.ThenTheStatusCodeShouldBe(HttpStatusCode.InternalServerError))
                 .BDDfy();
         }
 
diff --git a/test/Ocelot.UnitTests/Responder/ErrorsToHttpStatusCodeMapperTests.cs b/test/Ocelot.UnitTests/Responder/ErrorsToHttpStatusCodeMapperTests.cs
index af104aa6..d662f86f 100644
--- a/test/Ocelot.UnitTests/Responder/ErrorsToHttpStatusCodeMapperTests.cs
+++ b/test/Ocelot.UnitTests/Responder/ErrorsToHttpStatusCodeMapperTests.cs
@@ -47,6 +47,13 @@ namespace Ocelot.UnitTests.Responder
 
         [Theory]
         [InlineData(OcelotErrorCode.UnableToCompleteRequestError)]
+        public void should_return_internal_server_error(OcelotErrorCode errorCode)
+        {
+            ShouldMapErrorToStatusCode(errorCode, HttpStatusCode.InternalServerError);
+        }
+
+        [Theory]
+        [InlineData(OcelotErrorCode.ConnectionToDownstreamServiceError)]
         public void should_return_bad_gateway_error(OcelotErrorCode errorCode)
         {
             ShouldMapErrorToStatusCode(errorCode, HttpStatusCode.BadGateway);
@@ -125,7 +132,7 @@ namespace Ocelot.UnitTests.Responder
             // If this test fails then it's because the number of error codes has changed.
             // You should make the appropriate changes to the test cases here to ensure
             // they cover all the error codes, and then modify this assertion.
-            Enum.GetNames(typeof(OcelotErrorCode)).Length.ShouldBe(38, "Looks like the number of error codes has changed. Do you need to modify ErrorsToHttpStatusCodeMapper?");
+            Enum.GetNames(typeof(OcelotErrorCode)).Length.ShouldBe(39, "Looks like the number of error codes has changed. Do you need to modify ErrorsToHttpStatusCodeMapper?");
         }
 
         private void ShouldMapErrorToStatusCode(OcelotErrorCode errorCode, HttpStatusCode expectedHttpStatusCode)