diff --git a/tests/common/test_request_broker.nim b/tests/common/test_request_broker.nim
index 2e6eeecfc..c7a8d8453 100644
--- a/tests/common/test_request_broker.nim
+++ b/tests/common/test_request_broker.nim
@@ -393,9 +393,6 @@ RequestBroker:
 
   proc signatureFetch*(): Future[Result[ExternalAliasedResponse, string]] {.async.}
 
-RequestBroker(sync):
-  type PODTypeResponseSync = string
-
 RequestBroker(sync):
   type ExternalAliasedResponseSync = ExternalDefinedTypeSync
 
@@ -442,34 +439,6 @@ suite "RequestBroker macro (POD/external types)":
 
     ExternalAliasedResponse.clearProvider()
 
-  test "supports non-object response types (sync)":
-    check PODTypeResponseSync
-    .setProvider(
-      proc(): Result[PODTypeResponseSync, string] =
-        ok(PODTypeResponseSync("hello"))
-    )
-    .isOk()
-
-    let res = PODTypeResponseSync.request()
-    check res.isOk()
-    check string(res.value) == "hello"
-
-    PODTypeResponseSync.clearProvider()
-
-  test "POD type response possible (sync)":
-    check PODTypeResponseSync
-    .setProvider(
-      proc(): Result[PODTypeResponseSync, string] =
-        ok(PODTypeResponseSync("auto"))
-    )
-    .isOk()
-
-    let res = PODTypeResponseSync.request()
-    check res.isOk
-    check string(res.get()) == "auto"
-
-    PODTypeResponseSync.clearProvider()
-
   test "supports aliased external types (sync)":
     check ExternalAliasedResponseSync
     .setProvider(
diff --git a/waku/common/broker/request_broker.nim b/waku/common/broker/request_broker.nim
index 6be556eb2..b4000e1f3 100644
--- a/waku/common/broker/request_broker.nim
+++ b/waku/common/broker/request_broker.nim
@@ -123,7 +123,7 @@
 ##       ok("this is the info you wanted")
 ##   )
 ## let res = NeedThatInfo.request().valueOr:
-##   echo "not ok due" & error
+##   echo "not ok due to: " & error
 ##   NeedThatInfo(":-(")
 ##
 ## echo string(res)
@@ -478,7 +478,10 @@ proc generateRequestBroker(body: NimNode, mode: RequestBrokerMode): NimNode =
               await provider()
 
             if catchedRes.isErr():
-              return err("Request failed:" & catchedRes.error.msg)
+              return err(
+                "RequestBroker(" & `typeNameLit` & "): provider threw exception: " &
+                  catchedRes.error.msg
+              )
 
             let providerRes = catchedRes.get()
             if providerRes.isOk():
@@ -507,7 +510,10 @@ proc generateRequestBroker(body: NimNode, mode: RequestBrokerMode): NimNode =
             try:
               providerRes = provider()
             except CatchableError as e:
-              return err("Request failed:" & e.msg)
+              return err(
+                "RequestBroker(" & `typeNameLit` & "): provider threw exception: " &
+                  e.msg
+              )
 
             if providerRes.isOk():
               let resultValue = providerRes.get()
@@ -583,7 +589,10 @@ proc generateRequestBroker(body: NimNode, mode: RequestBrokerMode): NimNode =
           let catchedRes = catch:
             await `providerCall`
           if catchedRes.isErr():
-            return err("Request failed:" & catchedRes.error.msg)
+            return err(
+              "RequestBroker(" & `typeNameLit` & "): provider threw exception: " &
+                catchedRes.error.msg
+            )
 
           let providerRes = catchedRes.get()
           if providerRes.isOk():
@@ -602,7 +611,9 @@ proc generateRequestBroker(body: NimNode, mode: RequestBrokerMode): NimNode =
           try:
             providerRes = `providerCall`
           except CatchableError as e:
-            return err("Request failed:" & e.msg)
+            return err(
+              "RequestBroker(" & `typeNameLit` & "): provider threw exception: " & e.msg
+            )
 
           if providerRes.isOk():
             let resultValue = providerRes.get()