diff --git a/src/test/java/org/gaul/s3proxy/S3ProxyTest.java b/src/test/java/org/gaul/s3proxy/S3ProxyTest.java
index 72168e7..82e2b41 100644
--- a/src/test/java/org/gaul/s3proxy/S3ProxyTest.java
+++ b/src/test/java/org/gaul/s3proxy/S3ProxyTest.java
@@ -393,6 +393,9 @@ public final class S3ProxyTest {
             // UncheckedExecutionException?
             HttpResponseException hre = Throwables2.getFirstThrowableOfType(
                     re, HttpResponseException.class);
+            if (hre == null) {
+                throw re;
+            }
             assertThat(hre.getResponse().getStatusCode()).isEqualTo(
                     HttpServletResponse.SC_NOT_IMPLEMENTED);
         }