Merge ~lloydwaltersj/maas:informative-cli-404-error into maas:master

[Jack Lloyd-Walters]

Bring all doc strings containing `not-found` error up to parity with recent code changes.

[MAAS Lander (maas-lander)]

UNIT TESTS
-b informative-cli-404-error lp:~lloydwaltersj/maas/+git/maas into -b master lp:~maas-committers/maas

STATUS: FAILED
LOG: http://maas-ci.internal:8080/job/maas-tester/125/consoleText
COMMIT: fc0706216ef9da9dbf5a589a4e7426c691350432

review: Needs Fixing

fde1018... by Jack Lloyd-Walters on 2022-07-20

don't forget to lint. again

[MAAS Lander (maas-lander)]

UNIT TESTS
-b informative-cli-404-error lp:~lloydwaltersj/maas/+git/maas into -b master lp:~maas-committers/maas

STATUS: SUCCESS
COMMIT: fde1018d48c8464b8815a52057d460a57c1d145d

review: Approve

[Alexsander de Souza (alexsander-souza)]

+1

review: Approve

diff --git a/src/maasserver/api/bcache.py b/src/maasserver/api/bcache.py
index e7e87c4..3280494 100644
--- a/src/maasserver/api/bcache.py
+++ b/src/maasserver/api/bcache.py
@@ -57,7 +57,7 @@ class BcachesHandler(OperationsHandler):
         @error (http-status-code) "404" 404
         @error (content) "not-found" The requested system_id is not found.
         @error-example "not-found"
-            Not Found
+            No Bcache matches the given query.
         """
         machine = Machine.objects.get_node_or_404(
             system_id, request.user, NodePermission.view
@@ -95,7 +95,7 @@ class BcachesHandler(OperationsHandler):
         @error (http-status-code) "404" 404
         @error (content) "not-found" The requested system_id is not found.
         @error-example "not-found"
-            Not Found
+            No Bcache matches the given query.
 
         @error (http-status-code) "409" 409
         @error (content) "not-ready" The requested machine is not ready.
@@ -181,7 +181,7 @@ class BcacheHandler(OperationsHandler):
         @error (content) "not-found" The requested machine or bcache id is not
         found.
         @error-example "not-found"
-            Not Found
+            No Bcache matches the given query.
         """
         return Bcache.objects.get_object_or_404(
             system_id, id, request.user, NodePermission.view
@@ -200,7 +200,7 @@ class BcacheHandler(OperationsHandler):
         @error (content) "not-found" The requested id or system_id is not
         found.
         @error-example "not-found"
-            Not Found
+            No Bcache matches the given query.
 
         @error (http-status-code) "409" 409
         @error (content) "not-ready" The requested machine is not ready.
@@ -259,7 +259,7 @@ class BcacheHandler(OperationsHandler):
         @error (content) "not-found" The requested id or system_id is not
         found.
         @error-example "not-found"
-            Not Found
+            No Bcache matches the given query.
 
         @error (http-status-code) "409" 409
         @error (content) "not-ready" The requested machine is not ready.
diff --git a/src/maasserver/api/bcache_cacheset.py b/src/maasserver/api/bcache_cacheset.py
index d2e66f2..df26d39 100644
--- a/src/maasserver/api/bcache_cacheset.py
+++ b/src/maasserver/api/bcache_cacheset.py
@@ -48,7 +48,7 @@ class BcacheCacheSetsHandler(OperationsHandler):
         @error (http-status-code) "404" 404
         @error (content) "not-found" The requested machine is not found.
         @error-example "not-found"
-            Not Found
+            No Machine matches the given query
         """
         machine = Machine.objects.get_node_or_404(
             system_id, request.user, NodePermission.view
@@ -77,7 +77,7 @@ class BcacheCacheSetsHandler(OperationsHandler):
         @error (http-status-code) "404" 404
         @error (content) "not-found" The requested machine is not found.
         @error-example "not-found"
-            Not Found
+            No Machine matches the given query
 
         @error (http-status-code) "409" 409
         @error (content) "not-ready" The requested machine is not ready.
@@ -148,7 +148,7 @@ class BcacheCacheSetHandler(OperationsHandler):
         @error (http-status-code) "404" 404
         @error (content) "not-found" The requested machine is not found.
         @error-example "not-found"
-            Not Found
+            No Machine matches the given query
         """
         return CacheSet.objects.get_cache_set_or_404(
             system_id, id, request.user, NodePermission.view
@@ -169,7 +169,7 @@ class BcacheCacheSetHandler(OperationsHandler):
         @error (http-status-code) "404" 404
         @error (content) "not-found" The requested machine is not found.
         @error-example "not-found"
-            Not Found
+            No Machine matches the given query
 
         @error (http-status-code) "409" 409
         @error (content) "not-ready" The requested machine is not ready.
@@ -221,7 +221,7 @@ class BcacheCacheSetHandler(OperationsHandler):
         @error (http-status-code) "404" 404
         @error (content) "not-found" The requested machine is not found.
         @error-example "not-found"
-            Not Found
+            No Machine matches the given query
 
         @error (http-status-code) "409" 409
         @error (content) "not-ready" The requested machine is not ready.
diff --git a/src/maasserver/api/blockdevices.py b/src/maasserver/api/blockdevices.py
index 8241739..dfc9705 100644
--- a/src/maasserver/api/blockdevices.py
+++ b/src/maasserver/api/blockdevices.py
@@ -96,7 +96,7 @@ class BlockDevicesHandler(OperationsHandler):
         @error (http-status-code) "404" 404
         @error (content) "not-found" The requested machine is not found.
         @error-example "not-found"
-            Not Found
+            No BlockDevice matches the given query.
         """
         machine = Machine.objects.get_node_or_404(
             system_id, request.user, NodePermission.view
@@ -135,7 +135,7 @@ class BlockDevicesHandler(OperationsHandler):
         @error (http-status-code) "404" 404
         @error (content) "not-found" The requested machine is not found.
         @error-example "not-found"
-            Not Found
+            No BlockDevice matches the given query.
         """
         machine = Machine.objects.get_node_or_404(
             system_id, request.user, NodePermission.admin
@@ -269,7 +269,7 @@ class BlockDeviceHandler(OperationsHandler):
         @error (content) "not-found" The requested machine or block device is
         not found.
         @error-example "not-found"
-            Not Found
+            No BlockDevice matches the given query.
         """
         return BlockDevice.objects.get_block_device_or_404(
             system_id, id, request.user, NodePermission.view
@@ -292,7 +292,8 @@ class BlockDeviceHandler(OperationsHandler):
         @error (content) "not-found" The requested machine or block device is
         not found.
         @error-example "not-found"
-            Not Found
+            No BlockDevice matches the given query.
+
 
         @error (http-status-code) "409" 409
         @error (content) "not-ready" The requested machine is not ready.
@@ -362,7 +363,7 @@ class BlockDeviceHandler(OperationsHandler):
         @error (content) "not-found" The requested machine or block device is
         not found.
         @error-example "not-found"
-            Not Found
+            No BlockDevice matches the given query.
 
         @error (http-status-code) "409" 409
         @error (content) "not-ready" The requested machine is not ready.
@@ -427,7 +428,7 @@ class BlockDeviceHandler(OperationsHandler):
         @error (content) "not-found" The requested machine or block device is
         not found.
         @error-example "not-found"
-            Not Found
+            No BlockDevice matches the given query.
 
         @error (http-status-code) "409" 409
         @error (content) "not-ready" The requested machine is not ready.
@@ -468,7 +469,7 @@ class BlockDeviceHandler(OperationsHandler):
         @error (content) "not-found" The requested machine or block device is
         not found.
         @error-example "not-found"
-            Not Found
+            No BlockDevice matches the given query.
 
         @error (http-status-code) "409" 409
         @error (content) "not-ready" The requested machine is not ready.
@@ -511,7 +512,7 @@ class BlockDeviceHandler(OperationsHandler):
         @error (content) "not-found" The requested machine or block device is
         not found.
         @error-example "not-found"
-            Not Found
+            No BlockDevice matches the given query.
 
         @error (http-status-code) "409" 409
         @error (content) "not-ready" The requested machine is not ready.
@@ -555,7 +556,7 @@ class BlockDeviceHandler(OperationsHandler):
         @error (content) "not-found" The requested machine or block device is
         not found.
         @error-example "not-found"
-            Not Found
+            No BlockDevice matches the given query.
 
         @error (http-status-code) "409" 409
         @error (content) "not-ready" The requested machine is not ready.
@@ -614,7 +615,7 @@ class BlockDeviceHandler(OperationsHandler):
         @error (content) "not-found" The requested machine or block device is
         not found.
         @error-example "not-found"
-            Not Found
+            No BlockDevice matches the given query.
 
         @error (http-status-code) "409" 409
         @error (content) "not-ready" The requested machine is not ready.
@@ -659,7 +660,7 @@ class BlockDeviceHandler(OperationsHandler):
         @error (content) "not-found" The requested machine or block device is
         not found.
         @error-example "not-found"
-            Not Found
+            No BlockDevice matches the given query.
 
         @error (http-status-code) "409" 409
         @error (content) "not-ready" The requested machine is not ready.
@@ -705,7 +706,7 @@ class BlockDeviceHandler(OperationsHandler):
         @error (content) "not-found" The requested machine or block device is
         not found.
         @error-example "not-found"
-            Not Found
+            No BlockDevice matches the given query.
 
         @error (http-status-code) "409" 409
         @error (content) "not-ready" The requested machine is not ready.
diff --git a/src/maasserver/api/boot_resources.py b/src/maasserver/api/boot_resources.py
index f7cdf1f..bf2caee 100644
--- a/src/maasserver/api/boot_resources.py
+++ b/src/maasserver/api/boot_resources.py
@@ -323,7 +323,7 @@ class BootResourceHandler(OperationsHandler):
         @error (http-status-code) "404" 404
         @error (content) "not-found" The requested boot resource is not found.
         @error-example "not-found"
-            Not Found
+            No BootResource matches the given query.
         """
         resource = get_object_or_404(BootResource, id=id)
         stream = json_object(
@@ -347,7 +347,7 @@ class BootResourceHandler(OperationsHandler):
         @error (http-status-code) "404" 404
         @error (content) "not-found" The requested boot resource is not found.
         @error-example "not-found"
-            Not Found
+            No BootResource matches the given query.
         """
         resource = BootResource.objects.get(id=id)
         if resource is not None:
diff --git a/src/maasserver/api/boot_source_selections.py b/src/maasserver/api/boot_source_selections.py
index 8cd66c0..b2a163c 100644
--- a/src/maasserver/api/boot_source_selections.py
+++ b/src/maasserver/api/boot_source_selections.py
@@ -49,7 +49,7 @@ class BootSourceSelectionHandler(OperationsHandler):
         @error (content) "not-found" The requested boot-source or boot-source
         selection is not found.
         @error-example "not-found"
-            Not Found
+            No BootSource matches the given query.
         """
         boot_source = get_object_or_404(BootSource, id=boot_source_id)
         return get_object_or_404(
@@ -88,7 +88,7 @@ class BootSourceSelectionHandler(OperationsHandler):
         @error (content) "not-found" The requested boot-source or boot-source
         selection is not found.
         @error-example "not-found"
-            Not Found
+            No BootSource matches the given query.
         """
         boot_source = get_object_or_404(BootSource, id=boot_source_id)
         boot_source_selection = get_object_or_404(
@@ -115,7 +115,8 @@ class BootSourceSelectionHandler(OperationsHandler):
         @error (content) "not-found" The requested boot-source or boot-source
         selection is not found.
         @error-example "not-found"
-            Not Found
+            No BootSource matches the given query.
+
         """
         boot_source = get_object_or_404(BootSource, id=boot_source_id)
         boot_source_selection = get_object_or_404(
@@ -166,7 +167,7 @@ class BootSourceSelectionsHandler(OperationsHandler):
         @error (http-status-code) "404" 404
         @error (content) "not-found" The requested boot-source is not found.
         @error-example "not-found"
-            Not Found
+            No BootSource matches the given query.
         """
         boot_source = get_object_or_404(BootSource, id=boot_source_id)
         return BootSourceSelection.objects.filter(boot_source=boot_source)
@@ -201,7 +202,8 @@ class BootSourceSelectionsHandler(OperationsHandler):
         @error (http-status-code) "404" 404
         @error (content) "not-found" The requested boot-source is not found.
         @error-example "not-found"
-            Not Found
+            No BootSource matches the given query.
+
         """
         boot_source = get_object_or_404(BootSource, id=boot_source_id)
         form = BootSourceSelectionForm(
diff --git a/src/maasserver/api/boot_sources.py b/src/maasserver/api/boot_sources.py
index caf87d0..2591d63 100644
--- a/src/maasserver/api/boot_sources.py
+++ b/src/maasserver/api/boot_sources.py
@@ -52,7 +52,7 @@ class BootSourceHandler(OperationsHandler):
         @error (http-status-code) "404" 404
         @error (content) "not-found" The requested boot-source is not found.
         @error-example "not-found"
-            Not Found
+            No BootSource matches the given query.
         """
         return get_object_or_404(BootSource, id=id)
 
@@ -79,7 +79,8 @@ class BootSourceHandler(OperationsHandler):
         @error (http-status-code) "404" 404
         @error (content) "not-found" The requested boot-source is not found.
         @error-example "not-found"
-            Not Found
+            No BootSource matches the given query.
+
         """
         boot_source = get_object_or_404(BootSource, id=id)
         form = BootSourceForm(
@@ -101,7 +102,7 @@ class BootSourceHandler(OperationsHandler):
         @error (http-status-code) "404" 404
         @error (content) "not-found" The requested boot-source is not found.
         @error-example "not-found"
-            Not Found
+            No BootSource matches the given query.
         """
         boot_source = get_object_or_404(BootSource, id=id)
         boot_source.delete()
diff --git a/src/maasserver/api/devices.py b/src/maasserver/api/devices.py
index 07f5189..fb20082 100644
--- a/src/maasserver/api/devices.py
+++ b/src/maasserver/api/devices.py
@@ -93,7 +93,7 @@ class DeviceHandler(NodeHandler, WorkloadAnnotationsMixin):
         @error (http-status-code) "404" 404
         @error (content) "not-found" The requested device is not found.
         @error-example "not-found"
-            Not Found
+            No Device matches the given query.
         """
         device = self.model.objects.get_node_or_404(
             system_id=system_id, user=request.user, perm=NodePermission.edit
@@ -120,7 +120,7 @@ class DeviceHandler(NodeHandler, WorkloadAnnotationsMixin):
         @error (http-status-code) "404" 404
         @error (content) "not-found" The requested device is not found.
         @error-example "not-found"
-            Not Found
+            No Device matches the given query.
         """
         device = self.model.objects.get_node_or_404(
             system_id=system_id, user=request.user, perm=NodePermission.edit
@@ -149,7 +149,7 @@ class DeviceHandler(NodeHandler, WorkloadAnnotationsMixin):
         @error (http-status-code) "404" 404
         @error (content) "not-found" The requested device is not found.
         @error-example "not-found"
-            Not Found
+            No Device matches the given query.
         """
         device = self.model.objects.get_node_or_404(
             system_id=system_id, user=request.user, perm=NodePermission.admin
@@ -178,7 +178,8 @@ class DeviceHandler(NodeHandler, WorkloadAnnotationsMixin):
         @error (http-status-code) "404" 404
         @error (content) "not-found" The requested device is not found.
         @error-example "not-found"
-            Not Found
+            No Device matches the given query.
+
         """
         device = self.model.objects.get_node_or_404(
             system_id=system_id, user=request.user, perm=NodePermission.admin
diff --git a/src/maasserver/api/dhcpsnippets.py b/src/maasserver/api/dhcpsnippets.py
index ed4fcb9..d08967f 100644
--- a/src/maasserver/api/dhcpsnippets.py
+++ b/src/maasserver/api/dhcpsnippets.py
@@ -84,7 +84,7 @@ class DHCPSnippetHandler(OperationsHandler):
         @error (http-status-code) "404" 404
         @error (content) "not-found" The requested DHCP snippet is not found.
         @error-example "not-found"
-            Not Found
+            No DHCPSnippet matches the given query.
         """
         return DHCPSnippet.objects.get_dhcp_snippet_or_404(id)
 
@@ -125,7 +125,7 @@ class DHCPSnippetHandler(OperationsHandler):
         @error (http-status-code) "404" 404
         @error (content) "not-found" The requested DHCP snippet is not found.
         @error-example "not-found"
-            Not Found
+            No DHCPSnippet matches the given query.
         """
         dhcp_snippet = DHCPSnippet.objects.get_dhcp_snippet_or_404(id)
         form = DHCPSnippetForm(instance=dhcp_snippet, data=request.data)
@@ -146,7 +146,7 @@ class DHCPSnippetHandler(OperationsHandler):
         @error (http-status-code) "404" 404
         @error (content) "not-found" The requested DHCP snippet is not found.
         @error-example "not-found"
-            Not Found
+            No DHCPSnippet matches the given query.
         """
         dhcp_snippet = DHCPSnippet.objects.get_dhcp_snippet_or_404(id)
         dhcp_snippet.delete()
@@ -181,7 +181,7 @@ class DHCPSnippetHandler(OperationsHandler):
         @error (http-status-code) "404" 404
         @error (content) "not-found" The requested DHCP snippet is not found.
         @error-example "not-found"
-            Not Found
+            No DHCPSnippet matches the given query.
         """
         revert_to = request.data.get("to")
         if revert_to is None:
diff --git a/src/maasserver/api/discoveries.py b/src/maasserver/api/discoveries.py
index 0b58369..215959c 100644
--- a/src/maasserver/api/discoveries.py
+++ b/src/maasserver/api/discoveries.py
@@ -68,7 +68,7 @@ class DiscoveryHandler(OperationsHandler):
         @error (http-status-code) "404" 404
         @error (content) "not-found" The requested discovery is not found.
         @error-example "not-found"
-            Not Found
+            No Discovery matches the given query.
         """
         discovery_id = kwargs.get("discovery_id", None)
         discovery = Discovery.objects.get_discovery_or_404(discovery_id)
diff --git a/src/maasserver/api/dnsresourcerecords.py b/src/maasserver/api/dnsresourcerecords.py
index 4e25798..bd131f7 100644
--- a/src/maasserver/api/dnsresourcerecords.py
+++ b/src/maasserver/api/dnsresourcerecords.py
@@ -201,7 +201,7 @@ class DNSResourceRecordHandler(OperationsHandler):
         @error (content) "not-found" The requested DNS resource record was not
         found.
         @error-example "not-found"
-            Not Found
+            No DNSData matches the given query.
         """
         return DNSData.objects.get_dnsdata_or_404(
             id, request.user, NodePermission.view
@@ -232,7 +232,7 @@ class DNSResourceRecordHandler(OperationsHandler):
         @error (content) "not-found" The requested DNS resource record is not
         found.
         @error-example "not-found"
-            Not Found
+            No DNSData matches the given query.
         """
         dnsdata = DNSData.objects.get_dnsdata_or_404(
             id, request.user, NodePermission.admin
@@ -261,7 +261,7 @@ class DNSResourceRecordHandler(OperationsHandler):
         @error (content) "not-found" The requested DNS resource record is not
         found.
         @error-example "not-found"
-            Not Found
+            No DNSData matches the given query.
         """
         dnsdata = DNSData.objects.get_dnsdata_or_404(
             id, request.user, NodePermission.admin
diff --git a/src/maasserver/api/dnsresources.py b/src/maasserver/api/dnsresources.py
index 630c07d..5afe279 100644
--- a/src/maasserver/api/dnsresources.py
+++ b/src/maasserver/api/dnsresources.py
@@ -149,7 +149,7 @@ class DNSResourcesHandler(OperationsHandler):
         @error (http-status-code) "404" 404
         @error (content) "not-found" The requested DNS resources are not found.
         @error-example "not-found"
-            Not Found
+            No DNSResource matches the given query.
         """
         data = request.GET
         fqdn = data.get("fqdn", None)
@@ -283,7 +283,7 @@ class DNSResourceHandler(OperationsHandler):
         @error (http-status-code) "404" 404
         @error (content) "not-found" The requested DNS resource is not found.
         @error-example "not-found"
-            Not Found
+            No DNSResource matches the given query.
         """
         return DNSResource.objects.get_dnsresource_or_404(
             id, request.user, NodePermission.view
@@ -324,7 +324,7 @@ class DNSResourceHandler(OperationsHandler):
         @error (http-status-code) "404" 404
         @error (content) "not-found" The requested DNS resource is not found.
         @error-example "not-found"
-            Not Found
+            No DNSResource matches the given query.
         """
         data = request.data.copy()
         fqdn = data.get("fqdn", None)
@@ -377,7 +377,7 @@ class DNSResourceHandler(OperationsHandler):
         @error (http-status-code) "404" 404
         @error (content) "not-found" The requested DNS resource is not found.
         @error-example "not-found"
-            Not Found
+            No DNSResource matches the given query.
         """
         dnsresource = DNSResource.objects.get_dnsresource_or_404(
             id, request.user, NodePermission.admin
diff --git a/src/maasserver/api/domains.py b/src/maasserver/api/domains.py
index a88fe88..4f509cf 100644
--- a/src/maasserver/api/domains.py
+++ b/src/maasserver/api/domains.py
@@ -159,7 +159,7 @@ class DomainHandler(OperationsHandler):
         @error (http-status-code) "404" 404
         @error (content) "not-found" The requested domain is not found.
         @error-example "not-found"
-            Not Found
+            No Domain matches the given query.
         """
         return Domain.objects.get_domain_or_404(
             id, request.user, NodePermission.view
@@ -193,7 +193,7 @@ class DomainHandler(OperationsHandler):
         @error (http-status-code) "404" 404
         @error (content) "not-found" The requested domain name is not found.
         @error-example "not-found"
-            Not Found
+            No Domain matches the given query.
         """
         domain = Domain.objects.get_domain_or_404(
             id, request.user, NodePermission.admin
@@ -227,7 +227,7 @@ class DomainHandler(OperationsHandler):
         @error (http-status-code) "404" 404
         @error (content) "not-found" The requested domain name is not found.
         @error-example "not-found"
-            Not Found
+            No Domain matches the given query.
         """
         domain = Domain.objects.get_domain_or_404(
             id, request.user, NodePermission.admin
@@ -252,7 +252,7 @@ class DomainHandler(OperationsHandler):
         @error (http-status-code) "404" 404
         @error (content) "not-found" The requested domain name is not found.
         @error-example "not-found"
-            Not Found
+            No Domain matches the given query.
         """
         domain = Domain.objects.get_domain_or_404(
             id, request.user, NodePermission.admin
diff --git a/src/maasserver/api/fabrics.py b/src/maasserver/api/fabrics.py
index d4fd8cd..599bf4f 100644
--- a/src/maasserver/api/fabrics.py
+++ b/src/maasserver/api/fabrics.py
@@ -114,7 +114,7 @@ class FabricHandler(OperationsHandler):
         @error (http-status-code) "404" 404
         @error (content) "not-found" The requested fabric is not found.
         @error-example "not-found"
-            Not Found
+            No Fabric matches the given query.
         """
         return Fabric.objects.get_fabric_or_404(
             id, request.user, NodePermission.view
@@ -142,7 +142,7 @@ class FabricHandler(OperationsHandler):
         @error (http-status-code) "404" 404
         @error (content) "not-found" The requested fabric is not found.
         @error-example "not-found"
-            Not Found
+            No Fabric matches the given query.
         """
         fabric = Fabric.objects.get_fabric_or_404(
             id, request.user, NodePermission.admin
@@ -164,7 +164,7 @@ class FabricHandler(OperationsHandler):
         @error (http-status-code) "404" 404
         @error (content) "not-found" The requested fabric is not found.
         @error-example "not-found"
-            Not Found
+            No Fabric matches the given query.
         """
         fabric = Fabric.objects.get_fabric_or_404(
             id, request.user, NodePermission.admin
diff --git a/src/maasserver/api/files.py b/src/maasserver/api/files.py
index 88c8aa1..c086260 100644
--- a/src/maasserver/api/files.py
+++ b/src/maasserver/api/files.py
@@ -37,7 +37,7 @@ def get_file_by_name(handler, request):
     @error (http-status-code) "404" 404
     @error (content) "not-found" The requested file is not found.
     @error-example "not-found"
-        Not Found
+        File not found
     """
     filename = get_mandatory_param(request.GET, "filename")
     try:
@@ -62,7 +62,7 @@ def get_file_by_key(handler, request):
     @error (http-status-code) "404" 404
     @error (content) "not-found" The requested file is not found.
     @error-example "not-found"
-        Not Found
+        No FileStorage matches the given query.
     """
     key = get_mandatory_param(request.GET, "key")
     db_file = get_object_or_404(FileStorage, key=key)
@@ -180,7 +180,7 @@ class FileHandler(OperationsHandler):
         @error (http-status-code) "404" 404
         @error (content) "not-found" The requested file is not found.
         @error-example "not-found"
-            Not Found
+            No FileStorage matches the given query.
         """
         stored_file = get_object_or_404(
             FileStorage, filename=filename, owner=request.user
@@ -280,7 +280,7 @@ class FilesHandler(OperationsHandler):
         @error (http-status-code) "404" 404
         @error (content) "not-found" The requested file is not found.
         @error-example "not-found"
-            Not Found
+            No FileStorage matches the given query.
         """
         # It is valid for a path in a POST, PUT, or DELETE (or any other HTTP
         # method) to contain a query string. However, Django only makes
diff --git a/src/maasserver/api/interfaces.py b/src/maasserver/api/interfaces.py
index 99d0b94..e91f976 100644
--- a/src/maasserver/api/interfaces.py
+++ b/src/maasserver/api/interfaces.py
@@ -159,7 +159,7 @@ class InterfacesHandler(OperationsHandler):
         @error (http-status-code) "404" 404
         @error (content) "not-found" The requested machine is not found.
         @error-example "not-found"
-            Not Found
+            No Node matches the given query.
         """
         node = Node.objects.get_node_or_404(
             system_id, request.user, NodePermission.view
@@ -203,7 +203,8 @@ class InterfacesHandler(OperationsHandler):
         @error (http-status-code) "404" 404
         @error (content) "not-found" The requested machine is not found.
         @error-example "not-found"
-            Not Found
+            No Node matches the given query.
+
         """
         node = Node.objects.get_node_or_404(
             system_id, request.user, NodePermission.edit
@@ -335,7 +336,7 @@ class InterfacesHandler(OperationsHandler):
         @error (http-status-code) "404" 404
         @error (content) "not-found" The requested machine is not found.
         @error-example "not-found"
-            Not Found
+            No Machine matches the given query.
         """
         machine = Machine.objects.get_node_or_404(
             system_id, request.user, NodePermission.admin
@@ -381,7 +382,7 @@ class InterfacesHandler(OperationsHandler):
         @error (http-status-code) "404" 404
         @error (content) "not-found" The requested machine is not found.
         @error-example "not-found"
-            Not Found
+            No Machine matches the given query.
         """
         machine = Machine.objects.get_node_or_404(
             system_id, request.user, NodePermission.admin
@@ -449,7 +450,7 @@ class InterfacesHandler(OperationsHandler):
         @error (http-status-code) "404" 404
         @error (content) "not-found" The requested machine is not found.
         @error-example "not-found"
-            Not Found
+            No Machine matches the given query.
         """
         machine = Machine.objects.get_node_or_404(
             system_id, request.user, NodePermission.admin
@@ -553,7 +554,7 @@ class InterfaceHandler(OperationsHandler):
         @error (content) "not-found" The requested machine or interface is not
         found.
         @error-example "not-found"
-            Not Found
+            No Interface matches the given query.
         """
         return Interface.objects.get_interface_or_404(
             system_id, id, request.user, NodePermission.view
@@ -718,7 +719,7 @@ class InterfaceHandler(OperationsHandler):
         @error (content) "not-found" The requested machine or interface is not
         found.
         @error-example "not-found"
-            Not Found
+            No Interface matches the given query.
         """
         interface = Interface.objects.get_interface_or_404(
             system_id,
@@ -781,7 +782,7 @@ class InterfaceHandler(OperationsHandler):
         @error (content) "not-found" The requested machine or interface is not
         found.
         @error-example "not-found"
-            Not Found
+            No Interface matches the given query.
         """
         interface = Interface.objects.get_interface_or_404(
             system_id,
@@ -858,7 +859,7 @@ class InterfaceHandler(OperationsHandler):
         @error (content) "not-found" The requested machine or interface is not
         found.
         @error-example "not-found"
-            Not Found
+            No Interface matches the given query.
         """
         force = get_optional_param(
             request.POST, "force", default=False, validator=StringBool
@@ -917,7 +918,7 @@ class InterfaceHandler(OperationsHandler):
         @error (content) "not-found" The requested machine or interface is not
         found.
         @error-example "not-found"
-            Not Found
+            No Interface matches the given query.
         """
         interface = Interface.objects.get_interface_or_404(
             system_id,
@@ -962,7 +963,7 @@ class InterfaceHandler(OperationsHandler):
         @error (content) "not-found" The requested machine or interface is not
         found.
         @error-example "not-found"
-            Not Found
+            No Interface matches the given query.
         """
         interface = Interface.objects.get_interface_or_404(
             system_id,
@@ -1016,7 +1017,7 @@ class InterfaceHandler(OperationsHandler):
         @error (content) "not-found" The requested machine or interface is not
         found.
         @error-example "not-found"
-            Not Found
+            No Interface matches the given query.
         """
         interface = Interface.objects.get_interface_or_404(
             system_id,
@@ -1067,7 +1068,7 @@ class InterfaceHandler(OperationsHandler):
         @error (content) "not-found" The requested machine or interface is not
         found.
         @error-example "not-found"
-            Not Found
+            No Interface matches the given query.
         """
         interface = Interface.objects.get_interface_or_404(
             system_id,
@@ -1106,7 +1107,7 @@ class InterfaceHandler(OperationsHandler):
         @error (content) "not-found" The requested machine or interface is not
         found.
         @error-example "not-found"
-            Not Found
+            No Interface matches the given query.
         """
         interface = Interface.objects.get_interface_or_404(
             system_id,
diff --git a/src/maasserver/api/ipranges.py b/src/maasserver/api/ipranges.py
index 06060dc..01ce319 100644
--- a/src/maasserver/api/ipranges.py
+++ b/src/maasserver/api/ipranges.py
@@ -128,7 +128,7 @@ class IPRangeHandler(OperationsHandler):
         @error (http-status-code) "404" 404
         @error (content) "not-found" The requested IP range is not found.
         @error-example "not-found"
-            Not Found
+            No IPRange matches the given query.
         """
         iprange = IPRange.objects.get_iprange_or_404(id)
         return iprange
@@ -161,7 +161,7 @@ class IPRangeHandler(OperationsHandler):
         @error (http-status-code) "404" 404
         @error (content) "not-found" The requested IP range is not found.
         @error-example "not-found"
-            Not Found
+            No IPRange matches the given query.
         """
         iprange = IPRange.objects.get_iprange_or_404(id)
         raise_error_if_not_owner(iprange, request.user)
@@ -186,7 +186,7 @@ class IPRangeHandler(OperationsHandler):
         @error (http-status-code) "404" 404
         @error (content) "not-found" The requested IP range is not found.
         @error-example "not-found"
-            Not Found
+            No IPRange matches the given query.
         """
         iprange = IPRange.objects.get_iprange_or_404(id)
         raise_error_if_not_owner(iprange, request.user)
diff --git a/src/maasserver/api/machines.py b/src/maasserver/api/machines.py
index feda648..ac05639 100644
--- a/src/maasserver/api/machines.py
+++ b/src/maasserver/api/machines.py
@@ -400,7 +400,7 @@ class MachineHandler(NodeHandler, WorkloadAnnotationsMixin, PowerMixin):
         @error (http-status-code) "404" 404
         @error (content) "not-found" The requested static-route is not found.
         @error-example "not-found"
-            Not Found
+            No Machine matches the given query.
         """
         node = self.model.objects.get_node_or_404(
             system_id=system_id, user=request.user, perm=NodePermission.admin
@@ -635,7 +635,7 @@ class MachineHandler(NodeHandler, WorkloadAnnotationsMixin, PowerMixin):
         @error (http-status-code) "404" 404
         @error (content) "not-found" The requested machine is not found.
         @error-example "not-found"
-            Not Found
+            No Machine matches the given query.
 
         @error (http-status-code) "403" 403
         @error (content) "no-perms" The user does not have permission to update
@@ -756,7 +756,7 @@ class MachineHandler(NodeHandler, WorkloadAnnotationsMixin, PowerMixin):
         @error (http-status-code) "404" 404
         @error (content) "not-found" The requested machine is not found.
         @error-example "not-found"
-            Not Found
+            No Machine matches the given query.
 
         @error (http-status-code) "403" 403
         @error (content) "no-perms" The user does not have permission to deploy
@@ -919,7 +919,7 @@ class MachineHandler(NodeHandler, WorkloadAnnotationsMixin, PowerMixin):
         @error (http-status-code) "404" 404
         @error (content) "not-found" The requested machine is not found.
         @error-example "not-found"
-            Not Found
+            No Machine matches the given query.
 
         @error (http-status-code) "403" 403
         @error (content) "no-perms" The user does not have permission to
@@ -1022,7 +1022,7 @@ class MachineHandler(NodeHandler, WorkloadAnnotationsMixin, PowerMixin):
         @error (http-status-code) "404" 404
         @error (content) "not-found" The requested machine is not found.
         @error-example "not-found"
-            Not Found
+            No Machine matches the given query.
         """
         machine = self.model.objects.get_node_or_404(
             system_id=system_id, user=request.user, perm=NodePermission.admin
@@ -1096,7 +1096,7 @@ class MachineHandler(NodeHandler, WorkloadAnnotationsMixin, PowerMixin):
         @error (http-status-code) "404" 404
         @error (content) "not-found" The requested machine is not found.
         @error-example "not-found"
-            Not Found
+            No Machine matches the given query.
 
         @error (http-status-code) "403" 403
         @error (content) "no-perms" The user does not have permission to set
@@ -1171,7 +1171,7 @@ class MachineHandler(NodeHandler, WorkloadAnnotationsMixin, PowerMixin):
         @error (http-status-code) "404" 404
         @error (content) "not-found" The requested machine is not found.
         @error-example "not-found"
-            Not Found
+            No Machine matches the given query.
         """
         machine = self.model.objects.get_node_or_404(
             system_id=system_id, user=request.user, perm=NodePermission.edit
@@ -1214,7 +1214,7 @@ class MachineHandler(NodeHandler, WorkloadAnnotationsMixin, PowerMixin):
         @error (http-status-code) "404" 404
         @error (content) "not-found" The requested machine is not found.
         @error-example "not-found"
-            Not Found
+            No Machine matches the given query.
         """
         machine = self.model.objects.get_node_or_404(
             system_id=system_id, user=request.user, perm=NodePermission.edit
@@ -1267,7 +1267,7 @@ class MachineHandler(NodeHandler, WorkloadAnnotationsMixin, PowerMixin):
         @error (http-status-code) "404" 404
         @error (content) "not-found" The requested machine is not found.
         @error-example "not-found"
-            Not Found
+            No Machine matches the given query.
         """
         machine = self.model.objects.get_node_or_404(
             system_id=system_id, user=request.user, perm=NodePermission.admin
@@ -1297,7 +1297,7 @@ class MachineHandler(NodeHandler, WorkloadAnnotationsMixin, PowerMixin):
         @error (http-status-code) "404" 404
         @error (content) "not-found" The requested machine is not found.
         @error-example "not-found"
-            Not Found
+            No Machine matches the given query.
         """
         machine = self.model.objects.get_node_or_404(
             system_id=system_id, user=request.user, perm=NodePermission.view
@@ -1339,7 +1339,7 @@ class MachineHandler(NodeHandler, WorkloadAnnotationsMixin, PowerMixin):
         @error (http-status-code) "404" 404
         @error (content) "not-found" The requested machine is not found.
         @error-example "not-found"
-            Not Found
+            No Machine matches the given query.
         """
         machine = self.model.objects.get_node_or_404(
             system_id=system_id, user=request.user, perm=NodePermission.admin
@@ -1377,7 +1377,7 @@ class MachineHandler(NodeHandler, WorkloadAnnotationsMixin, PowerMixin):
         @error (http-status-code) "404" 404
         @error (content) "not-found" The requested machine is not found.
         @error-example "not-found"
-            Not Found
+            No Machine matches the given query.
         """
         machine = self.model.objects.get_node_or_404(
             system_id=system_id, user=request.user, perm=NodePermission.admin
@@ -1414,7 +1414,7 @@ class MachineHandler(NodeHandler, WorkloadAnnotationsMixin, PowerMixin):
         @error (http-status-code) "404" 404
         @error (content) "not-found" The requested machine is not found.
         @error-example "not-found"
-            Not Found
+            No Machine matches the given query.
         """
         machine = self.model.objects.get_node_or_404(
             system_id=system_id, user=request.user, perm=NodePermission.admin
@@ -1458,7 +1458,7 @@ class MachineHandler(NodeHandler, WorkloadAnnotationsMixin, PowerMixin):
         @error (http-status-code) "404" 404
         @error (content) "not-found" The requested machine is not found.
         @error-example "not-found"
-            Not Found
+            No Machine matches the given query.
         """
         node = self.model.objects.get_node_or_404(
             user=request.user, system_id=system_id, perm=NodePermission.edit
@@ -1495,7 +1495,7 @@ class MachineHandler(NodeHandler, WorkloadAnnotationsMixin, PowerMixin):
         @error (http-status-code) "404" 404
         @error (content) "not-found" The requested machine is not found.
         @error-example "not-found"
-            Not Found
+            No Machine matches the given query.
         """
         comment = get_optional_param(request.POST, "comment")
         node = self.model.objects.get_node_or_404(
@@ -1533,7 +1533,7 @@ class MachineHandler(NodeHandler, WorkloadAnnotationsMixin, PowerMixin):
         @error (http-status-code) "404" 404
         @error (content) "not-found" The requested machine is not found.
         @error-example "not-found"
-            Not Found
+            No Machine matches the given query.
         """
         machine = self.model.objects.get_node_or_404(
             system_id=system_id, user=request.user, perm=NodePermission.admin
@@ -1570,7 +1570,7 @@ class MachineHandler(NodeHandler, WorkloadAnnotationsMixin, PowerMixin):
         @error (http-status-code) "404" 404
         @error (content) "not-found" The requested machine is not found.
         @error-example "not-found"
-            Not Found
+            No Machine matches the given query.
         """
         machine = self.model.objects.get_node_or_404(
             system_id=system_id, user=request.user, perm=NodePermission.admin
@@ -1607,7 +1607,7 @@ class MachineHandler(NodeHandler, WorkloadAnnotationsMixin, PowerMixin):
         @error (http-status-code) "404" 404
         @error (content) "not-found" The requested machine is not found.
         @error-example "not-found"
-            Not Found
+            No Machine matches the given query.
         """
         machine = self.model.objects.get_node_or_404(
             system_id=system_id, user=request.user, perm=NodePermission.lock
@@ -1642,7 +1642,7 @@ class MachineHandler(NodeHandler, WorkloadAnnotationsMixin, PowerMixin):
         @error (http-status-code) "404" 404
         @error (content) "not-found" The requested machine is not found.
         @error-example "not-found"
-            Not Found
+            No Machine matches the given query.
         """
         machine = self.model.objects.get_node_or_404(
             system_id=system_id, user=request.user, perm=NodePermission.lock
diff --git a/src/maasserver/api/nodedevices.py b/src/maasserver/api/nodedevices.py
index 19db6f0..354150a 100644
--- a/src/maasserver/api/nodedevices.py
+++ b/src/maasserver/api/nodedevices.py
@@ -65,7 +65,7 @@ class NodeDevicesHandler(OperationsHandler):
         @error (http-status-code) "404" 404
         @error (content) "not-found" The requested machine is not found.
         @error-example "not-found"
-            Not Found
+            No Node matches the given query.
         """
         node = Node.objects.get_node_or_404(
             system_id=system_id, user=request.user, perm=NodePermission.view
@@ -222,7 +222,7 @@ class NodeDeviceHandler(OperationsHandler):
         @error (content) "not-found" The requested node or node device is
         not found.
         @error-example "not-found"
-            Not Found
+            No Node matches the given query.
         """
         return self._get_node_device(request, system_id, id)
 
@@ -243,7 +243,7 @@ class NodeDeviceHandler(OperationsHandler):
         @error (content) "not-found" The requested node or node device is
         not found.
         @error-example "not-found"
-            Not Found
+            No Node matches the given query.
         """
         node_device = self._get_node_device(request, system_id, id)
         node_device.delete()
diff --git a/src/maasserver/api/nodes.py b/src/maasserver/api/nodes.py
index de2a496..6896e07 100644
--- a/src/maasserver/api/nodes.py
+++ b/src/maasserver/api/nodes.py
@@ -453,7 +453,7 @@ class NodeHandler(OperationsHandler):
         @error (http-status-code) "404" 404
         @error (content) "not-found" The requested node is not found.
         @error-example "not-found"
-            Not Found
+            No Node matches the given query.
         """
         node = self.model.objects.get_node_or_404(
             system_id=system_id, user=request.user, perm=NodePermission.view
@@ -476,7 +476,7 @@ class NodeHandler(OperationsHandler):
         @error (http-status-code) "404" 404
         @error (content) "not-found" The requested node is not found.
         @error-example "not-found"
-            Not Found
+            No Node matches the given query.
 
         @error (http-status-code) "403" 403
         @error (content) "no-perms" The user is not authorized to delete the
@@ -542,7 +542,7 @@ class NodeHandler(OperationsHandler):
         @error (http-status-code) "404" 404
         @error (content) "not-found" The requested node is not found.
         @error-example "not-found"
-            Not Found
+            No Node matches the given query.
         """
         node = get_object_or_404(self.model, system_id=system_id)
         probe_details = get_single_probed_details(node)
@@ -577,7 +577,7 @@ class NodeHandler(OperationsHandler):
         @error (http-status-code) "404" 404
         @error (content) "not-found" The requested node is not found.
         @error-example "not-found"
-            Not Found
+            No Node matches the given query.
         """
         node = Node.objects.get_node_or_404(
             system_id, request.user, NodePermission.admin_read
@@ -943,7 +943,7 @@ class PowerMixin:
         @error (http-status-code) "404" 404
         @error (content) "not-found" The requested node is not found.
         @error-example "not-found"
-            Not Found
+            No Node matches the given query.
         """
         node = self.model.objects.get_node_or_404(
             system_id=system_id, user=request.user, perm=NodePermission.view
@@ -969,7 +969,7 @@ class PowerMixin:
         @error (http-status-code) "404" 404
         @error (content) "not-found" The requested node is not found.
         @error-example "not-found"
-            Not Found
+            No Node matches the given query.
 
         @error (http-status-code) "403" 403
         @error (content) "no-perms" The user is not authorized to power on the
@@ -1070,7 +1070,7 @@ class PowerMixin:
         @error (http-status-code) "404" 404
         @error (content) "not-found" The requested node is not found.
         @error-example "not-found"
-            Not Found
+            No Node matches the given query.
 
         @error (http-status-code) "403" 403
         @error (content) "no-perms" The user is not authorized to power off the
@@ -1121,7 +1121,7 @@ class PowerMixin:
         @error (http-status-code) "404" 404
         @error (content) "not-found" The requested node is not found.
         @error-example "not-found"
-            Not Found
+            No Node matches the given query.
         """
         node = self.model.objects.get_node_or_404(
             system_id=system_id, user=request.user, perm=NodePermission.admin
@@ -1147,7 +1147,7 @@ class PowerMixin:
         @error (http-status-code) "404" 404
         @error (content) "not-found" The requested node is not found.
         @error-example "not-found"
-            Not Found
+            No Node matches the given query.
 
         @error (http-status-code) "403" 403
         @error (content) "no-perms" The user is not authorized to override
@@ -1172,7 +1172,7 @@ class PowerMixin:
         @error (http-status-code) "404" 404
         @error (content) "not-found" The requested node is not found.
         @error-example "not-found"
-            Not Found
+            No Node matches the given query.
 
         @error (http-status-code) "403" 403
         @error (content) "no-perms" The user is not authorized to abort the
diff --git a/src/maasserver/api/notification.py b/src/maasserver/api/notification.py
index f8c98ca..0ce6e28 100644
--- a/src/maasserver/api/notification.py
+++ b/src/maasserver/api/notification.py
@@ -121,7 +121,7 @@ class NotificationHandler(OperationsHandler):
         @error (http-status-code) "404" 404
         @error (content) "not-found" The requested notification is not found.
         @error-example "not-found"
-            Not Found
+            No Notification matches the given query.
         """
         notification = get_object_or_404(Notification, id=id)
         if notification.is_relevant_to(request.user):
@@ -179,7 +179,7 @@ class NotificationHandler(OperationsHandler):
         @error (http-status-code) "404" 404
         @error (content) "not-found" The requested notification is not found.
         @error-example "not-found"
-            Not Found
+            No Notification matches the given query.
         """
         notification = get_object_or_404(Notification, id=id)
         form = NotificationForm(data=request.data, instance=notification)
@@ -200,7 +200,7 @@ class NotificationHandler(OperationsHandler):
         @error (http-status-code) "404" 404
         @error (content) "not-found" The requested notification is not found.
         @error-example "not-found"
-            Not Found
+            No Notification matches the given query.
         """
         notification = get_object_or_404(Notification, id=id)
         notification.delete()
@@ -224,7 +224,7 @@ class NotificationHandler(OperationsHandler):
         @error (http-status-code) "404" 404
         @error (content) "not-found" The requested notification is not found.
         @error-example "not-found"
-            Not Found
+            No Notification matches the given query.
         """
         notification = get_object_or_404(Notification, id=id)
         if notification.is_relevant_to(request.user):
diff --git a/src/maasserver/api/packagerepositories.py b/src/maasserver/api/packagerepositories.py
index ade7205..ab2755e 100644
--- a/src/maasserver/api/packagerepositories.py
+++ b/src/maasserver/api/packagerepositories.py
@@ -64,7 +64,7 @@ class PackageRepositoryHandler(OperationsHandler):
         @error (content) "not-found" The requested package repository is not
         found.
         @error-example "not-found"
-            Not Found
+            No PackageRepository matches the given query.
         """
         return PackageRepository.objects.get_object_or_404(id)
 
@@ -116,7 +116,7 @@ class PackageRepositoryHandler(OperationsHandler):
         @error (content) "not-found" The requested package repository is not
         found.
         @error-example "not-found"
-            Not Found
+            No PackageRepository matches the given query.
         """
         package_repository = PackageRepository.objects.get_object_or_404(id)
         form = PackageRepositoryForm(
@@ -140,7 +140,7 @@ class PackageRepositoryHandler(OperationsHandler):
         @error (content) "not-found" The requested package repository is not
         found.
         @error-example "not-found"
-            Not Found
+            No PackageRepository matches the given query.
         """
         package_repository = PackageRepository.objects.get_object_or_404(id)
         package_repository.delete()
diff --git a/src/maasserver/api/partitions.py b/src/maasserver/api/partitions.py
index dd1b431..4302d8d 100644
--- a/src/maasserver/api/partitions.py
+++ b/src/maasserver/api/partitions.py
@@ -94,7 +94,7 @@ class PartitionsHandler(OperationsHandler):
         @error (content) "not-found" The requested machine or device is not
         found.
         @error-example "not-found"
-            Not Found
+            No BlockDevice matches the given query.
         """
         device = BlockDevice.objects.get_block_device_or_404(
             system_id, device_id, request.user, NodePermission.view
@@ -131,7 +131,7 @@ class PartitionsHandler(OperationsHandler):
         @error (content) "not-found" The requested machine or device is not
         found.
         @error-example "not-found"
-            Not Found
+            No BlockDevice matches the given query.
         """
         device = BlockDevice.objects.get_block_device_or_404(
             system_id, device_id, request.user, NodePermission.admin
@@ -213,7 +213,7 @@ class PartitionHandler(OperationsHandler):
         @error (content) "not-found" The requested machine, device or partition
         is not found.
         @error-example "not-found"
-            Not Found
+            No BlockDevice matches the given query.
         """
         device = BlockDevice.objects.get_block_device_or_404(
             system_id, device_id, request.user, NodePermission.view
@@ -235,7 +235,7 @@ class PartitionHandler(OperationsHandler):
         @error (content) "not-found" The requested machine, device or partition
         is not found.
         @error-example "not-found"
-            Not Found
+            No BlockDevice matches the given query.
         """
         device = BlockDevice.objects.get_block_device_or_404(
             system_id, device_id, request.user, NodePermission.admin
@@ -282,7 +282,7 @@ class PartitionHandler(OperationsHandler):
         @error (content) "not-found" The requested machine, device or partition
         is not found.
         @error-example "not-found"
-            Not Found
+            No BlockDevice matches the given query.
         """
         device = BlockDevice.objects.get_block_device_or_404(
             system_id, device_id, request.user, NodePermission.edit
@@ -318,7 +318,7 @@ class PartitionHandler(OperationsHandler):
         @error (content) "not-found" The requested machine, device or partition
         is not found.
         @error-example "not-found"
-            Not Found
+            No BlockDevice matches the given query.
         """
         device = BlockDevice.objects.get_block_device_or_404(
             system_id, device_id, request.user, NodePermission.edit
@@ -376,7 +376,7 @@ class PartitionHandler(OperationsHandler):
         @error (content) "not-found" The requested machine, device or partition
         is not found.
         @error-example "not-found"
-            Not Found
+            No BlockDevice matches the given query.
         """
         device = BlockDevice.objects.get_block_device_or_404(
             system_id, device_id, request.user, NodePermission.edit
@@ -422,7 +422,7 @@ class PartitionHandler(OperationsHandler):
         @error (content) "not-found" The requested machine, device or partition
         is not found.
         @error-example "not-found"
-            Not Found
+            No BlockDevice matches the given query.
         """
         device = BlockDevice.objects.get_block_device_or_404(
             system_id, device_id, request.user, NodePermission.edit
@@ -468,7 +468,7 @@ class PartitionHandler(OperationsHandler):
         @error (content) "not-found" The requested machine, device or partition
         is not found.
         @error-example "not-found"
-            Not Found
+            No BlockDevice matches the given query.
         """
         device = BlockDevice.objects.get_block_device_or_404(
             system_id, device_id, request.user, NodePermission.admin
@@ -504,7 +504,7 @@ class PartitionHandler(OperationsHandler):
         @error (content) "not-found" The requested machine, device or partition
         is not found.
         @error-example "not-found"
-            Not Found
+            No BlockDevice matches the given query.
         """
         device = BlockDevice.objects.get_block_device_or_404(
             system_id, device_id, request.user, NodePermission.admin
diff --git a/src/maasserver/api/pods.py b/src/maasserver/api/pods.py
index 85f1d59..f4bfbea 100644
--- a/src/maasserver/api/pods.py
+++ b/src/maasserver/api/pods.py
@@ -177,7 +177,7 @@ class VmHostHandler(OperationsHandler):
         @error (http-status-code) "404" 404
         @error (content) "not-found" No VM host with that ID can be found.
         @error-example "not-found"
-            Not Found
+            No Pod matches the given query.
 
         @error (http-status-code) "403" 403
         @error (content) "no-perms" The user does not have the permissions
@@ -208,7 +208,7 @@ class VmHostHandler(OperationsHandler):
         @error (http-status-code) "404" 404
         @error (content) "not-found" No VM host with that ID can be found.
         @error-example "not-found"
-            Not Found
+            No Pod matches the given query.
 
         @error (http-status-code) "403" 403
         @error (content) "no-perms" The user does not have the permissions
@@ -239,7 +239,7 @@ class VmHostHandler(OperationsHandler):
         @error (http-status-code) "404" 404
         @error (content) "not-found" No VM host with that ID can be found.
         @error-example "not-found"
-            Not Found
+            No Pod matches the given query.
 
         @error (http-status-code) "403" 403
         @error (content) "no-perms" The user does not have the permissions
@@ -321,7 +321,7 @@ class VmHostHandler(OperationsHandler):
         @error (http-status-code) "404" 404
         @error (content) "not-found" No VM host with that ID can be found.
         @error-example "not-found"
-            Not Found
+            No Pod matches the given query.
 
         @error (http-status-code) "403" 403
         @error (content) "no-perms" The user does not have the permissions
@@ -365,7 +365,7 @@ class VmHostHandler(OperationsHandler):
         @error (http-status-code) "404" 404
         @error (content) "not-found" No VM host with that ID can be found.
         @error-example "not-found"
-            Not Found
+            No Pod matches the given query.
 
         @error (http-status-code) "403" 403
         @error (content) "no-perms" The user does not have the permissions
@@ -400,7 +400,7 @@ class VmHostHandler(OperationsHandler):
         @error (http-status-code) "404" 404
         @error (content) "not-found" No VM host with that ID can be found.
         @error-example "not-found"
-            Not Found
+            No Pod matches the given query.
 
         @error (http-status-code) "403" 403
         @error (content) "no-perms" The user does not have the permissions
@@ -502,7 +502,7 @@ class VmHostsHandler(OperationsHandler):
         @error (http-status-code) "404" 404
         @error (content) "not-found" No VM host with that ID can be found.
         @error-example "not-found"
-            Not Found
+            No Pod matches the given query.
 
         @error (http-status-code) "403" 403
         @error (content) "no-perms" The user does not have the permissions
diff --git a/src/maasserver/api/rackcontrollers.py b/src/maasserver/api/rackcontrollers.py
index b489f81..71710fb 100644
--- a/src/maasserver/api/rackcontrollers.py
+++ b/src/maasserver/api/rackcontrollers.py
@@ -106,7 +106,7 @@ class RackControllerHandler(NodeHandler, PowerMixin):
         @error (content) "not-found" The requested rack controller system_id
         is not found.
         @error-example "not-found"
-            Not Found
+            No RackController matches the given query.
 
         @error (http-status-code) "403" 403
         @error (content) "no-perms" The user does not have permssions to
@@ -165,7 +165,7 @@ class RackControllerHandler(NodeHandler, PowerMixin):
         @error (content) "not-found" The requested rack controller system_id
         is not found.
         @error-example "not-found"
-            Not Found
+            No RackController matches the given query.
 
         @error (http-status-code) "403" 403
         @error (content) "no-perms" This method is reserved for admin users.
@@ -198,7 +198,7 @@ class RackControllerHandler(NodeHandler, PowerMixin):
         @error (content) "not-found" The requested rack controller system_id
         is not found.
         @error-example "not-found"
-            Not Found
+            No RackController matches the given query.
         """
         # Avoid circular import.
         from maasserver.clusterrpc.boot_images import RackControllersImporter
@@ -227,7 +227,7 @@ class RackControllerHandler(NodeHandler, PowerMixin):
         @error (content) "not-found" The requested rack controller system_id
         is not found.
         @error-example "not-found"
-            Not Found
+            No RackController matches the given query.
         """
         rack = self.model.objects.get_node_or_404(
             system_id=system_id, user=request.user, perm=NodePermission.view
@@ -262,7 +262,7 @@ class RackControllersHandler(NodesHandler, PowersMixin):
         @error (content) "not-found" The requested rack controller system_id
         is not found.
         @error-example "not-found"
-            Not Found
+            No RackController matches the given query.
         """
         # Avoid circular import.
         from maasserver.clusterrpc.boot_images import RackControllersImporter
diff --git a/src/maasserver/api/raid.py b/src/maasserver/api/raid.py
index 0fc4916..7a44165 100644
--- a/src/maasserver/api/raid.py
+++ b/src/maasserver/api/raid.py
@@ -73,7 +73,7 @@ class RaidsHandler(OperationsHandler):
         @error (http-status-code) "404" 404
         @error (content) "not-found" The requested machine is not found.
         @error-example "not-found"
-            Not Found
+            No Machine matches the given query.
 
         @error (http-status-code) "409" 409
         @error (content) "not-ready" The requested machine is not ready.
@@ -110,7 +110,7 @@ class RaidsHandler(OperationsHandler):
         @error (http-status-code) "404" 404
         @error (content) "not-found" The requested machine is not found.
         @error-example "not-found"
-            Not Found
+            No Machine matches the given query.
         """
         machine = Machine.objects.get_node_or_404(
             system_id, request.user, NodePermission.view
@@ -205,7 +205,7 @@ class RaidHandler(OperationsHandler):
         @error (content) "not-found" The requested machine or RAID is not
         found.
         @error-example "not-found"
-            Not Found
+            No RAID matches the given query.
         """
         return RAID.objects.get_object_or_404(
             system_id, id, request.user, NodePermission.view
@@ -258,7 +258,7 @@ class RaidHandler(OperationsHandler):
         @error (content) "not-found" The requested machine or RAID id is not
         found.
         @error-example "not-found"
-            Not Found
+            No RAID matches the given query.
 
         @error (http-status-code) "409" 409
         @error (content) "not-ready" The requested machine is not ready.
@@ -292,7 +292,7 @@ class RaidHandler(OperationsHandler):
         @error (content) "not-found" The requested machine or RAID is not
         found.
         @error-example "not-found"
-            Not Found
+            No RAID matches the given query.
 
         @error (http-status-code) "409" 409
         @error (content) "not-ready" The requested machine is not ready.
diff --git a/src/maasserver/api/regioncontrollers.py b/src/maasserver/api/regioncontrollers.py
index 229de5f..cf0bafe 100644
--- a/src/maasserver/api/regioncontrollers.py
+++ b/src/maasserver/api/regioncontrollers.py
@@ -93,7 +93,7 @@ class RegionControllerHandler(NodeHandler):
         @error (content) "not-found" The requested rack controller system_id
         is not found.
         @error-example "not-found"
-            Not Found
+            No RegionController matches the given query.
 
         @error (http-status-code) "403" 403
         @error (content) "no-perms" The user does not have permission to
@@ -151,7 +151,7 @@ class RegionControllerHandler(NodeHandler):
         @error (content) "not-found" The requested region controller system_id
         is not found.
         @error-example "not-found"
-            Not Found
+            No RegionController matches the given query.
 
         @error (http-status-code) "403" 403
         @error (content) "no-perms" The user does not have permission to
diff --git a/src/maasserver/api/resourcepools.py b/src/maasserver/api/resourcepools.py
index bb0e25a..a28c6fd 100644
--- a/src/maasserver/api/resourcepools.py
+++ b/src/maasserver/api/resourcepools.py
@@ -58,7 +58,7 @@ class ResourcePoolHandler(ModelOperationsHandler):
         @error (http-status-code) "404" 404
         @error (content) "notfound" The resource pool name is not found.
         @error-example "notfound"
-            Not Found
+            No ResourcePool matches the given query.
         """
         return ResourcePool.objects.get_resource_pool_or_404(
             id, request.user, self.permission_read
@@ -93,7 +93,7 @@ class ResourcePoolHandler(ModelOperationsHandler):
         @error (http-status-code) "404" 404
         @error (content) "notfound" Zone not found
         @error-example "notfound"
-            Not Found
+            No ResourcePool matches the given query.
         """
         pool = ResourcePool.objects.get_resource_pool_or_404(
             id, request.user, self.permission_edit
diff --git a/src/maasserver/api/scriptresults.py b/src/maasserver/api/scriptresults.py
index 8640cfc..8ca1855 100644
--- a/src/maasserver/api/scriptresults.py
+++ b/src/maasserver/api/scriptresults.py
@@ -116,7 +116,7 @@ class NodeScriptResultsHandler(OperationsHandler):
         @error (http-status-code) "404" 404
         @error (content) "not-found" The requested machine is not found.
         @error-example "not-found"
-            Not Found
+            No Node matches the given query.
         """
         node = Node.objects.get_node_or_404(
             system_id=system_id, user=request.user, perm=NodePermission.view
@@ -308,7 +308,7 @@ class NodeScriptResultHandler(OperationsHandler):
         @error (content) "not-found" The requested machine or script result is
         not found.
         @error-example "not-found"
-            Not Found
+            No Node matches the given query.
         """
         script_set = self._get_script_set(request, system_id, id)
         include_output = get_optional_param(
@@ -346,7 +346,7 @@ class NodeScriptResultHandler(OperationsHandler):
         @error (content) "not-found" The requested machine or script result is
         not found.
         @error-example "not-found"
-            Not Found
+            No Node matches the given query.
         """
         script_set = self._get_script_set(request, system_id, id)
         script_set.delete()
@@ -413,7 +413,7 @@ class NodeScriptResultHandler(OperationsHandler):
         @error (content) "not-found" The requested machine or script result is
         not found.
         @error-example "not-found"
-            Not Found
+            No Node matches the given query.
         """
         script_set = self._get_script_set(request, system_id, id)
         filters = get_optional_param(request.GET, "filters", None, String)
@@ -547,7 +547,7 @@ class NodeScriptResultHandler(OperationsHandler):
         @error (content) "not-found" The requested machine or script result is
         not found.
         @error-example "not-found"
-            Not Found
+            No Node matches the given query.
         """
         script_set = self._get_script_set(request, system_id, id)
         include_output = get_optional_param(
diff --git a/src/maasserver/api/scripts.py b/src/maasserver/api/scripts.py
index 50d6ab4..40b2221 100644
--- a/src/maasserver/api/scripts.py
+++ b/src/maasserver/api/scripts.py
@@ -265,7 +265,7 @@ class NodeScriptHandler(OperationsHandler):
         @error (http-status-code) "404" 404
         @error (content) "not-found" The requested script is not found.
         @error-example "not-found"
-            Not Found
+            No Script matches the given query.
         """
         if name.isdigit():
             script = get_object_or_404(Script, id=int(name))
@@ -288,7 +288,7 @@ class NodeScriptHandler(OperationsHandler):
         @error (http-status-code) "404" 404
         @error (content) "not-found" The requested script is not found.
         @error-example "not-found"
-            Not Found
+            No Script matches the given query.
         """
         if name.isdigit():
             script = get_object_or_404(Script, id=int(name))
@@ -374,7 +374,7 @@ class NodeScriptHandler(OperationsHandler):
         @error (http-status-code) "404" 404
         @error (content) "not-found" The requested script is not found.
         @error-example "not-found"
-            Not Found
+            No Script matches the given query.
         """
         if name.isdigit():
             script = get_object_or_404(Script, id=int(name))
@@ -414,7 +414,7 @@ class NodeScriptHandler(OperationsHandler):
         @error (http-status-code) "404" 404
         @error (content) "not-found" The requested script is not found.
         @error-example "not-found"
-            Not Found
+            No Script matches the given query.
         """
         if name.isdigit():
             script = get_object_or_404(Script, id=int(name))
@@ -455,7 +455,7 @@ class NodeScriptHandler(OperationsHandler):
         @error (http-status-code) "404" 404
         @error (content) "not-found" The requested script is not found.
         @error-example "not-found"
-            Not Found
+            No Script matches the given query.
         """
         revert_to = get_mandatory_param(request.data, "to", Int)
 
@@ -505,7 +505,7 @@ class NodeScriptHandler(OperationsHandler):
         @error (http-status-code) "404" 404
         @error (content) "not-found" The requested script is not found.
         @error-example "not-found"
-            Not Found
+            No Script matches the given query.
         """
         tag = get_mandatory_param(request.data, "tag", String)
 
@@ -547,7 +547,7 @@ class NodeScriptHandler(OperationsHandler):
         @error (http-status-code) "404" 404
         @error (content) "not-found" The requested script is not found.
         @error-example "not-found"
-            Not Found
+            No Script matches the given query.
         """
         tag = get_mandatory_param(request.data, "tag", String)
 
diff --git a/src/maasserver/api/spaces.py b/src/maasserver/api/spaces.py
index ca4a0b6..ee31c71 100644
--- a/src/maasserver/api/spaces.py
+++ b/src/maasserver/api/spaces.py
@@ -147,7 +147,7 @@ class SpaceHandler(OperationsHandler):
         @error (http-status-code) "404" 404
         @error (content) "not-found" The requested space is not found.
         @error-example "not-found"
-            Not Found
+            No Space matches the given query.
         """
         # Backward compatibility for Juju 2.0. This is a special case to check
         # if the user requested to read the undefined space.
@@ -174,7 +174,7 @@ class SpaceHandler(OperationsHandler):
         @error (http-status-code) "404" 404
         @error (content) "not-found" The requested space is not found.
         @error-example "not-found"
-            Not Found
+            No Space matches the given query.
         """
         if id == "-1" or id == Space.UNDEFINED:
             raise MAASAPIBadRequest(
@@ -200,7 +200,7 @@ class SpaceHandler(OperationsHandler):
         @error (http-status-code) "404" 404
         @error (content) "not-found" The requested space is not found.
         @error-example "not-found"
-            Not Found
+            No Space matches the given query.
         """
         if id == "-1" or id == Space.UNDEFINED:
             raise MAASAPIBadRequest(
diff --git a/src/maasserver/api/ssh_keys.py b/src/maasserver/api/ssh_keys.py
index 4692f82..ea6fed7 100644
--- a/src/maasserver/api/ssh_keys.py
+++ b/src/maasserver/api/ssh_keys.py
@@ -183,7 +183,7 @@ class SSHKeyHandler(OperationsHandler):
         @error (http-status-code) "404" 404
         @error (content) "not-found" The requested SSH key is not found.
         @error-example "not-found"
-            Not Found
+            No SSHKey matches the given query.
         """
         key = get_object_or_404(SSHKey, id=id)
         return key
@@ -199,7 +199,7 @@ class SSHKeyHandler(OperationsHandler):
         @error (http-status-code) "404" 404
         @error (content) "not-found" The requested SSH key is not found.
         @error-example "not-found"
-            Not Found
+            No SSHKey matches the given query.
 
         @error (http-status-code) "403" 403
         @error (content) "no-perms" The requesting user does not own the key.
diff --git a/src/maasserver/api/ssl_keys.py b/src/maasserver/api/ssl_keys.py
index da19023..a6edcbd 100644
--- a/src/maasserver/api/ssl_keys.py
+++ b/src/maasserver/api/ssl_keys.py
@@ -107,7 +107,7 @@ class SSLKeyHandler(OperationsHandler):
         @error (http-status-code) "404" 404
         @error (content) "not-found" The requested SSH key is not found.
         @error-example "not-found"
-            Not Found
+            No SSLKey matches the given query.
 
         @error (http-status-code) "403" 403
         @error (content) "no-perms" The requesting user does not own the key.
@@ -130,7 +130,7 @@ class SSLKeyHandler(OperationsHandler):
         @error (http-status-code) "404" 404
         @error (content) "not-found" The requested SSH key is not found.
         @error-example "not-found"
-            Not Found
+            No SSLKey matches the given query.
 
         @error (http-status-code) "403" 403
         @error (content) "no-perms" The requesting user does not own the key.
diff --git a/src/maasserver/api/staticroutes.py b/src/maasserver/api/staticroutes.py
index 5aee239..9eb0833 100644
--- a/src/maasserver/api/staticroutes.py
+++ b/src/maasserver/api/staticroutes.py
@@ -105,7 +105,7 @@ class StaticRouteHandler(OperationsHandler):
         @error (http-status-code) "404" 404
         @error (content) "not-found" The requested static-route is not found.
         @error-example "not-found"
-            Not Found
+            No StaticRoute matches the given query.
         """
         return StaticRoute.objects.get_staticroute_or_404(
             id, request.user, NodePermission.view
@@ -138,7 +138,7 @@ class StaticRouteHandler(OperationsHandler):
         @error (http-status-code) "404" 404
         @error (content) "not-found" The requested static-route is not found.
         @error-example "not-found"
-            Not Found
+            No StaticRoute matches the given query.
         """
         staticroute = StaticRoute.objects.get_staticroute_or_404(
             id, request.user, NodePermission.admin
@@ -160,7 +160,7 @@ class StaticRouteHandler(OperationsHandler):
         @error (http-status-code) "404" 404
         @error (content) "not-found" The requested static-route is not found.
         @error-example "not-found"
-            Not Found
+            No StaticRoute matches the given query.
         """
         staticroute = StaticRoute.objects.get_staticroute_or_404(
             id, request.user, NodePermission.admin
diff --git a/src/maasserver/api/subnets.py b/src/maasserver/api/subnets.py
index 178e5c2..5aebd12 100644
--- a/src/maasserver/api/subnets.py
+++ b/src/maasserver/api/subnets.py
@@ -175,7 +175,7 @@ class SubnetHandler(OperationsHandler):
         @error (http-status-code) "404" 404
         @error (content) "not-found" The requested subnet is not found.
         @error-example "not-found"
-            Not Found
+            No Subnet matches the given query.
         """
         return Subnet.objects.get_subnet_or_404(
             id, request.user, NodePermission.view
@@ -260,7 +260,7 @@ class SubnetHandler(OperationsHandler):
         @error (http-status-code) "404" 404
         @error (content) "not-found" The requested subnet is not found.
         @error-example "not-found"
-            Not Found
+            No Subnet matches the given query.
         """
         subnet = Subnet.objects.get_subnet_or_404(
             id, request.user, NodePermission.admin
@@ -282,7 +282,7 @@ class SubnetHandler(OperationsHandler):
         @error (http-status-code) "404" 404
         @error (content) "not-found" The requested subnet is not found.
         @error-example "not-found"
-            Not Found
+            No Subnet matches the given query.
         """
         subnet = Subnet.objects.get_subnet_or_404(
             id, request.user, NodePermission.admin
@@ -306,7 +306,7 @@ class SubnetHandler(OperationsHandler):
         @error (http-status-code) "404" 404
         @error (content) "not-found" The requested subnet is not found.
         @error-example "not-found"
-            Not Found
+            No Subnet matches the given query.
         """
         subnet = Subnet.objects.get_subnet_or_404(
             id, request.user, NodePermission.view
@@ -329,7 +329,7 @@ class SubnetHandler(OperationsHandler):
         @error (http-status-code) "404" 404
         @error (content) "not-found" The requested subnet is not found.
         @error-example "not-found"
-            Not Found
+            No Subnet matches the given query.
         """
         subnet = Subnet.objects.get_subnet_or_404(
             id, request.user, NodePermission.view
@@ -377,7 +377,7 @@ class SubnetHandler(OperationsHandler):
         @error (http-status-code) "404" 404
         @error (content) "not-found" The requested subnet is not found.
         @error-example "not-found"
-            Not Found
+            No Subnet matches the given query.
         """
         subnet = Subnet.objects.get_subnet_or_404(
             id, request.user, NodePermission.view
@@ -425,7 +425,7 @@ class SubnetHandler(OperationsHandler):
         @error (http-status-code) "404" 404
         @error (content) "not-found" The requested subnet is not found.
         @error-example "not-found"
-            Not Found
+            No Subnet matches the given query.
         """
         subnet = Subnet.objects.get_subnet_or_404(
             id, request.user, NodePermission.view
diff --git a/src/maasserver/api/tags.py b/src/maasserver/api/tags.py
index f33eab2..0b90743 100644
--- a/src/maasserver/api/tags.py
+++ b/src/maasserver/api/tags.py
@@ -87,7 +87,7 @@ class TagHandler(OperationsHandler):
         @error (http-status-code) "404" 404
         @error (content) "not-found" The requested tag name is not found.
         @error-example "not-found"
-            Not Found
+            No Tag matches the given query.
         """
         return Tag.objects.get_tag_or_404(name=name, user=request.user)
 
@@ -117,7 +117,7 @@ class TagHandler(OperationsHandler):
         @error (http-status-code) "404" 404
         @error (content) "not-found" The requested tag name is not found.
         @error-example "not-found"
-            Not Found
+            No Tag matches the given query.
         """
         tag = Tag.objects.get_tag_or_404(
             name=name, user=request.user, to_edit=True
@@ -157,7 +157,7 @@ class TagHandler(OperationsHandler):
         @error (http-status-code) "404" 404
         @error (content) "not-found" The requested tag name is not found.
         @error-example "not-found"
-            Not Found
+            No Tag matches the given query.
         """
         tag = Tag.objects.get_tag_or_404(
             name=name, user=request.user, to_edit=True
@@ -206,7 +206,7 @@ class TagHandler(OperationsHandler):
         @error (http-status-code) "404" 404
         @error (content) "not-found" The requested tag name is not found.
         @error-example "not-found"
-            Not Found
+            No Tag matches the given query.
         """
         return self._get_node_type(Node, request, name)
 
@@ -226,7 +226,7 @@ class TagHandler(OperationsHandler):
         @error (http-status-code) "404" 404
         @error (content) "not-found" The requested tag name is not found.
         @error-example "not-found"
-            Not Found
+            No Tag matches the given query.
         """
         return self._get_node_type(Machine, request, name)
 
@@ -246,7 +246,7 @@ class TagHandler(OperationsHandler):
         @error (http-status-code) "404" 404
         @error (content) "not-found" The requested tag name is not found.
         @error-example "not-found"
-            Not Found
+            No Tag matches the given query.
         """
         return self._get_node_type(Device, request, name)
 
@@ -266,7 +266,7 @@ class TagHandler(OperationsHandler):
         @error (http-status-code) "404" 404
         @error (content) "not-found" The requested tag name is not found.
         @error-example "not-found"
-            Not Found
+            No Tag matches the given query.
         """
         return self._get_node_type(RackController, request, name)
 
@@ -286,7 +286,7 @@ class TagHandler(OperationsHandler):
         @error (http-status-code) "404" 404
         @error (content) "not-found" The requested tag name is not found.
         @error-example "not-found"
-            Not Found
+            No Tag matches the given query.
         """
         return self._get_node_type(RegionController, request, name)
 
@@ -316,7 +316,7 @@ class TagHandler(OperationsHandler):
         @error (http-status-code) "404" 404
         @error (content) "not-found" The requested tag name is not found.
         @error-example "not-found"
-            Not Found
+            No Tag matches the given query.
         """
         tag = Tag.objects.get_tag_or_404(
             name=name, user=request.user, to_edit=True
@@ -371,7 +371,7 @@ class TagHandler(OperationsHandler):
         @error (http-status-code) "404" 404
         @error (content) "not-found" The requested tag name is not found.
         @error-example "not-found"
-            Not Found
+            No Tag matches the given query.
         """
         tag = Tag.objects.get_tag_or_404(name=name, user=request.user)
         rack_controller = None
diff --git a/src/maasserver/api/users.py b/src/maasserver/api/users.py
index 6df2ab4..8578510 100644
--- a/src/maasserver/api/users.py
+++ b/src/maasserver/api/users.py
@@ -146,7 +146,7 @@ class UserHandler(OperationsHandler):
         @error (http-status-code) "404" 404
         @error (content) "not-found" The given user was not found.
         @error-example "not-found"
-            Not Found
+            No User matches the given query.
         """
         return get_object_or_404(User, username=username)
 
diff --git a/src/maasserver/api/vlans.py b/src/maasserver/api/vlans.py
index 3e2a49a..9154e22 100644
--- a/src/maasserver/api/vlans.py
+++ b/src/maasserver/api/vlans.py
@@ -56,7 +56,7 @@ class VlansHandler(OperationsHandler):
         @error (http-status-code) "404" 404
         @error (content) "not-found" The requested fabric_id is not found.
         @error-example "not-found"
-            Not Found
+            No Fabric matches the given query.
         """
         fabric = Fabric.objects.get_fabric_or_404(
             fabric_id, request.user, NodePermission.view
@@ -91,7 +91,7 @@ class VlansHandler(OperationsHandler):
         @error (http-status-code) "404" 404
         @error (content) "not-found" The requested fabric_id is not found.
         @error-example "not-found"
-            Not Found
+            No Fabric matches the given query.
         """
         fabric = Fabric.objects.get_fabric_or_404(
             fabric_id, request.user, NodePermission.admin
@@ -197,7 +197,7 @@ class VlanHandler(OperationsHandler):
         @error (content) "not-found" The requested fabric_id or vid is not
         found.
         @error-example "not-found"
-            Not Found
+            No Fabric matches the given query.
         """
         vlan = self._get_vlan(request.user, NodePermission.view, **kwargs)
         return vlan
@@ -246,7 +246,7 @@ class VlanHandler(OperationsHandler):
         @error (content) "not-found" The requested fabric_id or vid is not
         found.
         @error-example "not-found"
-            Not Found
+            No Fabric matches the given query.
         """
         vlan = self._get_vlan(request.user, NodePermission.admin, **kwargs)
         data = {}
@@ -278,7 +278,7 @@ class VlanHandler(OperationsHandler):
         @error (content) "not-found" The requested fabric_id or vid is not
         found.
         @error-example "not-found"
-            Not Found
+            No Fabric matches the given query.
         """
         vlan = self._get_vlan(request.user, NodePermission.admin, **kwargs)
         vlan.delete()
diff --git a/src/maasserver/api/vmcluster.py b/src/maasserver/api/vmcluster.py
index 9e61410..dbc1ead 100644
--- a/src/maasserver/api/vmcluster.py
+++ b/src/maasserver/api/vmcluster.py
@@ -147,7 +147,7 @@ class VmClusterHandler(OperationsHandler):
         @error (http-status-code) "404" 404
         @error (content) "not-found" No VM cluster with that ID can be found.
         @error-example "not-found"
-            Not Found
+            No VMCluster matches the given query.
 
         @error (http-status-code) "403" 403
         @error (content) "no-perms" The user does not have the permissions
diff --git a/src/maasserver/api/vmfs_datastores.py b/src/maasserver/api/vmfs_datastores.py
index 4406037..df68f51 100644
--- a/src/maasserver/api/vmfs_datastores.py
+++ b/src/maasserver/api/vmfs_datastores.py
@@ -55,7 +55,7 @@ class VmfsDatastoresHandler(OperationsHandler):
         @error (http-status-code) "404" 404
         @error (content) "not-found" The requested machine is not found.
         @error-example "not-found"
-            Not Found
+            No Machine matches the given query.
         """
         machine = Machine.objects.get_node_or_404(
             system_id, request.user, NodePermission.view
@@ -92,7 +92,7 @@ class VmfsDatastoresHandler(OperationsHandler):
         @error (http-status-code) "404" 404
         @error (content) "not-found" The requested machine is not found.
         @error-example "not-found"
-            Not Found
+            No Machine matches the given query.
 
         @error (http-status-code) "409" 409
         @error (content) "not-ready" The requested machine is not ready.
@@ -184,7 +184,7 @@ class VmfsDatastoreHandler(OperationsHandler):
         @error (http-status-code) "404" 404
         @error (content) "not-found" The requested machine is not found.
         @error-example "not-found"
-            Not Found
+            No VMFS matches the given query.
         """
         return VMFS.objects.get_object_or_404(
             system_id, id, request.user, NodePermission.view
@@ -221,7 +221,7 @@ class VmfsDatastoreHandler(OperationsHandler):
         @error (http-status-code) "404" 404
         @error (content) "not-found" The requested machine is not found.
         @error-example "not-found"
-            Not Found
+            No VMFS matches the given query.
 
         @error (http-status-code) "409" 409
         @error (content) "not-ready" The requested machine is not ready.
@@ -255,7 +255,7 @@ class VmfsDatastoreHandler(OperationsHandler):
         @error (http-status-code) "404" 404
         @error (content) "not-found" The requested machine is not found.
         @error-example "not-found"
-            Not Found
+            No VMFS matches the given query.
 
         @error (http-status-code) "409" 409
         @error (content) "not-ready" The requested machine is not ready.
diff --git a/src/maasserver/api/volume_groups.py b/src/maasserver/api/volume_groups.py
index e795527..553e7c7 100644
--- a/src/maasserver/api/volume_groups.py
+++ b/src/maasserver/api/volume_groups.py
@@ -63,7 +63,7 @@ class VolumeGroupsHandler(OperationsHandler):
         @error (http-status-code) "404" 404
         @error (content) "not-found" The requested machine is not found.
         @error-example "not-found"
-            Not Found
+            No Machine matches the given query.
         """
         machine = Machine.objects.get_node_or_404(
             system_id, request.user, NodePermission.view
@@ -100,7 +100,7 @@ class VolumeGroupsHandler(OperationsHandler):
         @error (http-status-code) "404" 404
         @error (content) "not-found" The requested machine is not found.
         @error-example "not-found"
-            Not Found
+            No Machine matches the given query.
 
         @error (http-status-code) "409" 409
         @error (content) "not-ready" The requested machine is not ready.
@@ -200,7 +200,7 @@ class VolumeGroupHandler(OperationsHandler):
         @error (http-status-code) "404" 404
         @error (content) "not-found" The requested machine is not found.
         @error-example "not-found"
-            Not Found
+            No VolumeGroup matches the given query.
         """
         return VolumeGroup.objects.get_object_or_404(
             system_id, id, request.user, NodePermission.view
@@ -240,7 +240,7 @@ class VolumeGroupHandler(OperationsHandler):
         @error (http-status-code) "404" 404
         @error (content) "not-found" The requested machine is not found.
         @error-example "not-found"
-            Not Found
+            No VolumeGroup matches the given query.
 
         @error (http-status-code) "409" 409
         @error (content) "not-ready" The requested machine is not ready.
@@ -273,7 +273,7 @@ class VolumeGroupHandler(OperationsHandler):
         @error (http-status-code) "404" 404
         @error (content) "not-found" The requested machine is not found.
         @error-example "not-found"
-            Not Found
+            No VolumeGroup matches the given query.
 
         @error (http-status-code) "409" 409
         @error (content) "not-ready" The requested machine is not ready.
@@ -316,7 +316,7 @@ class VolumeGroupHandler(OperationsHandler):
         @error (http-status-code) "404" 404
         @error (content) "not-found" The requested machine is not found.
         @error-example "not-found"
-            Not Found
+            No VolumeGroup matches the given query.
 
         @error (http-status-code) "409" 409
         @error (content) "not-ready" The requested machine is not ready.
@@ -356,7 +356,7 @@ class VolumeGroupHandler(OperationsHandler):
         @error (http-status-code) "404" 404
         @error (content) "not-found" The requested machine is not found.
         @error-example "not-found"
-            Not Found
+            No VolumeGroup matches the given query.
 
         @error (http-status-code) "409" 409
         @error (content) "not-ready" The requested machine is not ready.
diff --git a/src/maasserver/api/zones.py b/src/maasserver/api/zones.py
index 229bf6e..698caab 100644
--- a/src/maasserver/api/zones.py
+++ b/src/maasserver/api/zones.py
@@ -63,7 +63,7 @@ class ZoneHandler(ModelOperationsHandler):
         @error (http-status-code) "404" 404
         @error (content) "notfound" The zone name is not found.
         @error-example "notfound"
-            Not Found
+            No Zone matches the given query.
         """
         return super().read(request, name=name)
 
@@ -95,7 +95,7 @@ class ZoneHandler(ModelOperationsHandler):
         @error (http-status-code) "404" 404
         @error (content) "notfound" Zone not found
         @error-example "notfound"
-            Not Found
+            No Zone matches the given query.
         """
         return super().update(request, name=name)