Merge pull request #292 from Dimaqa/224_fix

Fix of #224
netbox-community · Dec 29, 2020 · 636ddeb · 636ddeb
2 parents 50cb312 + d65ddb6
commit 636ddeb
Showing 1 changed file with 16 additions and 11 deletions.
diff --git a/pynetbox/core/endpoint.py b/pynetbox/core/endpoint.py
@@ -147,18 +147,23 @@ def get(self, *args, **kwargs):
                     return filter_lookup[0]
             return None
 
-        try:
-            req = Request(
-                key=key,
-                base=self.url,
-                token=self.token,
-                session_key=self.session_key,
-                http_session=self.api.http_session,
-            )
-        except RequestError:
-            return None
+        req = Request(
+            key=key,
+            base=self.url,
+            token=self.token,
+            session_key=self.session_key,
+            http_session=self.api.http_session,
+        )
 
-        return response_loader(req.get(), self.return_obj, self)
+        try:
+            resp = req.get()
+        except RequestError as e:
+            if e.req.status_code == 404:
+                return None
+            else:
+                raise e
+
+        return response_loader(resp, self.return_obj, self)
 
     def filter(self, *args, **kwargs):
         r"""Queries the 'ListView' of a given endpoint.