From e1c7b22b7d8019627cb6411bf4e987100acea70c Mon Sep 17 00:00:00 2001
From: Andrew Gaul <andrew@gaul.org>
Date: Fri, 16 Jan 2015 15:14:34 -0800
Subject: [PATCH] Handle NoSuchBucket during copy object

---
 src/main/java/org/gaul/s3proxy/S3ProxyHandler.java | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/src/main/java/org/gaul/s3proxy/S3ProxyHandler.java b/src/main/java/org/gaul/s3proxy/S3ProxyHandler.java
index 356c45d..50e1586 100644
--- a/src/main/java/org/gaul/s3proxy/S3ProxyHandler.java
+++ b/src/main/java/org/gaul/s3proxy/S3ProxyHandler.java
@@ -878,7 +878,13 @@ final class S3ProxyHandler extends AbstractHandler {
             return;
         }
 
-        Blob blob = blobStore.getBlob(sourceContainerName, sourceBlobName);
+        Blob blob;
+        try {
+            blob = blobStore.getBlob(sourceContainerName, sourceBlobName);
+        } catch (ContainerNotFoundException cnfe) {
+            sendSimpleErrorResponse(response, S3ErrorCode.NO_SUCH_BUCKET);
+            return;
+        }
         if (blob == null) {
             sendSimpleErrorResponse(response, S3ErrorCode.NO_SUCH_KEY);
             return;