@@ -1,3 +1,6 @@
+### Version 9.4.1
+* 404 responses are no longer swallowed for `void` return types.
+
 ### Version 9.4
 * Adds Builder class to JAXBDecoder for disabling namespace-awareness (defaults to true).
 
 
@@ -132,7 +132,7 @@ Object executeAndDecode(RequestTemplate template) throws Throwable {
         } else {
           return decode(response);
         }
-      } else if (decode404 && response.status() == 404) {
+      } else if (decode404 && response.status() == 404 && void.class != metadata.returnType()) {
         return decode(response);
       } else {
         throw errorDecoder.decode(metadata.configKey(), response);
 
@@ -23,6 +23,7 @@
 import okhttp3.mockwebserver.MockWebServer;
 
 import java.util.Collection;
+import java.util.Collections;
 import java.util.LinkedHashMap;
 import okio.Buffer;
 import org.assertj.core.api.Fail;
@@ -597,6 +598,18 @@ public Object decode(Response response, Type type) throws IOException {
     api.post();
   }
 
+  @Test
+  public void decodingDoesNotSwallow404ErrorsInDecode404Mode() throws Exception {
+    server.enqueue(new MockResponse().setResponseCode(404));
+    thrown.expect(IllegalArgumentException.class);
+
+    TestInterface api = new TestInterfaceBuilder()
+        .decode404()
+        .errorDecoder(new IllegalArgumentExceptionOn404())
+        .target("http://localhost:" + server.getPort());
+    api.queryMap(Collections.emptyMap());
+  }
+
   @Test
   public void okIfEncodeRootCauseHasNoMessage() throws Exception {
     server.enqueue(new MockResponse().setBody("success!"));
@@ -805,6 +818,17 @@ public Exception decode(String methodKey, Response response) {
     }
   }
 
+  static class IllegalArgumentExceptionOn404 extends ErrorDecoder.Default {
+
+    @Override
+    public Exception decode(String methodKey, Response response) {
+      if (response.status() == 404) {
+        return new IllegalArgumentException("bad zone name");
+      }
+      return super.decode(methodKey, response);
+    }
+  }
+
   static final class TestInterfaceBuilder {
 
     private final Feign.Builder delegate = new Feign.Builder()
Original file line number	Diff line number	Diff line change
`@@ -132,7 +132,7 @@ Object executeAndDecode(RequestTemplate template) throws Throwable {`
`132`	`132`	`} else {`
`133`	`133`	`return decode(response);`
`134`	`134`	`}`
`135`		`- } else if (decode404 && response.status() == 404) {`
	`135`	`+ } else if (decode404 && response.status() == 404 && void.class != metadata.returnType()) {`
`136`	`136`	`return decode(response);`
`137`	`137`	`} else {`
`138`	`138`	`throw errorDecoder.decode(metadata.configKey(), response);`