diff --git a/src/main/java/org/gaul/s3proxy/S3ProxyHandler.java b/src/main/java/org/gaul/s3proxy/S3ProxyHandler.java
index f8a1be8..a78a2be 100644
--- a/src/main/java/org/gaul/s3proxy/S3ProxyHandler.java
+++ b/src/main/java/org/gaul/s3proxy/S3ProxyHandler.java
@@ -134,13 +134,8 @@ final class S3ProxyHandler extends AbstractHandler {
                 handleContainerAcl(response, uri.substring(1));
                 baseRequest.setHandled(true);
                 return;
-            } else if (uri.lastIndexOf("/") == 0) {
-                handleBlobList(request, response, uri.substring(1));
-                baseRequest.setHandled(true);
-                return;
-            } else if (uri.lastIndexOf("/") == uri.length() - 1) {
-                handleBlobList(request, response, uri.substring(1,
-                        uri.length() - 1));
+            } else if (path.length <= 2 || path[2].isEmpty()) {
+                handleBlobList(request, response, path[1]);
                 baseRequest.setHandled(true);
                 return;
             } else {