diff --git a/foreman/client.py b/foreman/client.py
index 2b738c5..ecb164f 100644
--- a/foreman/client.py
+++ b/foreman/client.py
@@ -882,7 +882,9 @@ def _process_request_result(self, res):
         """Generic function to process the result of an HTTP request"""
         if res.status_code < 200 or res.status_code >= 300:
             if res.status_code == 404:
-                return []
+                if res.request.method == 'GET':
+                    return []
+                raise ObjectNotFound(res, None)
             elif res.status_code == 406:
                 raise Unacceptable(res, None)
             raise ForemanException(