diff --git a/gateleen-routing/src/main/java/org/swisspush/gateleen/routing/StorageForwarder.java b/gateleen-routing/src/main/java/org/swisspush/gateleen/routing/StorageForwarder.java
index e50877aa..1e48c221 100755
--- a/gateleen-routing/src/main/java/org/swisspush/gateleen/routing/StorageForwarder.java
+++ b/gateleen-routing/src/main/java/org/swisspush/gateleen/routing/StorageForwarder.java
@@ -68,8 +68,8 @@ public void handle(final RoutingContext ctx) {
         monitoringHandler.updateRequestsMeter("localhost", ctx.request().uri());
         monitoringHandler.updateRequestPerRuleMonitoring(ctx.request(), rule.getMetricName());
         final long startTime = monitoringHandler.startRequestMetricTracking(rule.getMetricName(), ctx.request().uri());
-        log.debug("Forwarding request: {} to storage {} {} with rule {}", ctx.request().uri(), rule.getStorage(),
-                targetUri, rule.getRuleIdentifier());
+        log.debug("Forwarding {} request: {} to storage {} {} with rule {}", ctx.request().method(), ctx.request().uri(),
+                rule.getStorage(), targetUri, rule.getRuleIdentifier());
         final HeadersMultiMap requestHeaders = new HeadersMultiMap();
         requestHeaders.addAll(ctx.request().headers());
 
@@ -109,7 +109,7 @@ public void handle(final RoutingContext ctx) {
                     JsonObject responseJson = new JsonObject(buffer.getString(4, headerLength + 4));
                     JsonArray headers = responseJson.getJsonArray("headers");
                     MultiMap responseHeaders = null;
-                    if (headers != null && headers.size() > 0) {
+                    if (headers != null && !headers.isEmpty()) {
                         responseHeaders = JsonMultiMap.fromJson(headers);
 
                         setUniqueIdHeader(responseHeaders);