diff --git a/mockserver-tests/src/test/groovy/pl/touk/mockserver/tests/MockServerIntegrationTest.groovy b/mockserver-tests/src/test/groovy/pl/touk/mockserver/tests/MockServerIntegrationTest.groovy
index 5bb550b..e8f4d87 100644
--- a/mockserver-tests/src/test/groovy/pl/touk/mockserver/tests/MockServerIntegrationTest.groovy
+++ b/mockserver-tests/src/test/groovy/pl/touk/mockserver/tests/MockServerIntegrationTest.groovy
@@ -1114,4 +1114,23 @@ class MockServerIntegrationTest extends Specification {
             remoteMockServer.removeMock('testRest')?.size() == 0
     }
 
+    def "should handle empty post"() {
+        expect:
+            remoteMockServer.addMock(new AddMock(
+                name: 'testRest',
+                path: 'testEndpoint',
+                port: 9999,
+                statusCode: 201,
+                soap: false
+            ))
+        when:
+            HttpPost restPost = new HttpPost('http://localhost:9999/testEndpoint')
+            CloseableHttpResponse response = client.execute(restPost)
+        then:
+            response.statusLine.statusCode == 201
+            Util.consumeResponse(response)
+        expect:
+            remoteMockServer.removeMock('testRest')?.size() == 1
+    }
+
 }
diff --git a/mockserver/src/main/groovy/pl/touk/mockserver/server/ContextExecutor.groovy b/mockserver/src/main/groovy/pl/touk/mockserver/server/ContextExecutor.groovy
index f450df4..b26eb5a 100644
--- a/mockserver/src/main/groovy/pl/touk/mockserver/server/ContextExecutor.groovy
+++ b/mockserver/src/main/groovy/pl/touk/mockserver/server/ContextExecutor.groovy
@@ -20,28 +20,39 @@ class ContextExecutor {
         this.mocks = new CopyOnWriteArrayList<>([initialMock])
         httpServerWraper.createContext(path) {
             HttpExchange ex ->
-                MockRequest request = new MockRequest(ex.requestBody.text, ex.requestHeaders, ex.requestURI)
-                log.info('Mock received input')
-                log.debug("Request: ${request.text}")
-                for (Mock mock : mocks) {
-                    try {
-                        if (mock.match(Method.valueOf(ex.requestMethod), request)) {
-                            log.debug("Mock ${mock.name} match request ${request.text}")
-                            MockResponse httpResponse = mock.apply(request)
-                            fillExchange(ex, httpResponse)
-                            log.trace("Mock ${mock.name} response with body ${httpResponse.text}")
-                            return
-                        }
-                        log.debug("Mock ${mock.name} does not match request")
-                    } catch (Exception e) {
-                        log.warn("An exception occured when matching or applying mock ${mock.name}", e)
-                    }
+                try {
+                    applyMocks(ex)
+                } catch (Exception e) {
+                    log.error("Exceptiony occured handling request", e)
+                    throw e
+                } finally {
+                    ex.close()
                 }
-                log.warn("Any mock does not match request ${request.text}")
-                Util.createResponse(ex, request.text, 404)
         }
     }
 
+    private void applyMocks(HttpExchange ex) {
+        MockRequest request = new MockRequest(ex.requestBody.text, ex.requestHeaders, ex.requestURI)
+        log.info('Mock received input')
+        log.debug("Request: ${request.text}")
+        for (Mock mock : mocks) {
+            try {
+                if (mock.match(Method.valueOf(ex.requestMethod), request)) {
+                    log.debug("Mock ${mock.name} match request ${request.text}")
+                    MockResponse httpResponse = mock.apply(request)
+                    fillExchange(ex, httpResponse)
+                    log.trace("Mock ${mock.name} response with body ${httpResponse.text}")
+                    return
+                }
+                log.debug("Mock ${mock.name} does not match request")
+            } catch (Exception e) {
+                log.warn("An exception occured when matching or applying mock ${mock.name}", e)
+            }
+        }
+        log.warn("Any mock does not match request ${request.text}")
+        Util.createResponse(ex, request.text, 404)
+    }
+
     String getPath() {
         return path.substring(1)
     }