diff --git a/docker/clientbase.py b/docker/clientbase.py
index c81ee0c509..ce52ffa738 100644
--- a/docker/clientbase.py
+++ b/docker/clientbase.py
@@ -99,6 +99,8 @@ def _raise_for_status(self, response, explanation=None):
         try:
             response.raise_for_status()
         except requests.exceptions.HTTPError as e:
+            if e.response.status_code == 404:
+                raise errors.NotFound(e, response, explanation=explanation)
             raise errors.APIError(e, response, explanation=explanation)
 
     def _result(self, response, json=False, binary=False):
diff --git a/docker/errors.py b/docker/errors.py
index d15e332799..066406ae25 100644
--- a/docker/errors.py
+++ b/docker/errors.py
@@ -53,6 +53,10 @@ class DockerException(Exception):
     pass
 
 
+class NotFound(APIError):
+    pass
+
+
 class InvalidVersion(DockerException):
     pass