diff --git a/poc/bin/kapow b/poc/bin/kapow
index bde9c1a..e9d6e66 100755
--- a/poc/bin/kapow
+++ b/poc/bin/kapow
@@ -178,14 +178,14 @@ async def get_field(request):
     try:
         connection = CONNECTIONS[id]
     except KeyError:
-        response = web.HTTPNotFound()
+        response = web.Response(status=404, reason="Handler ID Not Found")
     else:
         try:
             content = await connection.get(field)
         except ValueError:
             return web.Response(status=400, reason="Invalid Resource Path")
         except KeyError:
-            return web.Response(status=204, reason="Resource Item Not Found")
+            return web.Response(status=404, reason="Resource Item Not Found")
 
         if isinstance(content, StreamReader):
             response = web.StreamResponse(status=200, reason="OK")
@@ -211,7 +211,7 @@ async def set_field(request):
     try:
         connection = CONNECTIONS[id]
     except KeyError:
-        response = web.HTTPNotFound()
+        response = web.Response(status=404, reason="Handler ID Not Found")
     else:
         try:
             await connection.set(field, request.content)
diff --git a/spec/test/features/data/handler/error_notfound.feature b/spec/test/features/data/handler/error_handleridnotfound.feature
similarity index 74%
rename from spec/test/features/data/handler/error_notfound.feature
rename to spec/test/features/data/handler/error_handleridnotfound.feature
index aef71c3..1e12d3e 100644
--- a/spec/test/features/data/handler/error_notfound.feature
+++ b/spec/test/features/data/handler/error_handleridnotfound.feature
@@ -4,21 +4,21 @@ Feature: Fail to retrieve resources from nonexistent handler in Kapow! server.
 
   Scenario: Try to get a valid resource path from a nonexistent handler.
     A request to retrieve a resource from a
-    nonexistent handler will trigger a not found
-    error.
+    nonexistent handler will trigger
+    a handler ID not found error.
 
     Given I have a running Kapow! server
     When I get the resource "/request/path" for the handler with id "XXXXXXXXXX"
     Then I get 404 as response code
-      And I get "Not Found" as response reason phrase
+      And I get "Handler ID Not Found" as response reason phrase
 
   Scenario: Try to get an invalid resource from a nonexistent handler.
     A request to retrieve an invalid resource
     from a nonexistent handler will trigger a
-    not found error even if the resource is
-    invalid.
+    handler ID not found error
+    even if the resource is invalid.
 
     Given I have a running Kapow! server
     When I get the resource "/invalid/path" for the handler with id "XXXXXXXXXX"
     Then I get 404 as response code
-      And I get "Not Found" as response reason phrase
+      And I get "Handler ID Not Found" as response reason phrase
diff --git a/spec/test/features/data/handler/error_itemnotfound.feature b/spec/test/features/data/handler/error_itemnotfound.feature
index 9cf11fa..002935d 100644
--- a/spec/test/features/data/handler/error_itemnotfound.feature
+++ b/spec/test/features/data/handler/error_itemnotfound.feature
@@ -12,5 +12,5 @@ Feature: Fail to retrieve nonexistent resource items in Kapow! server.
       | GET    | /foo        |
     When I send a request to the testing route "/foo"
       And I get the resource "/request/params/meloinvento"
-    Then I get 204 as response code
+    Then I get 404 as response code
       And I get "Resource Item Not Found" as response reason phrase