1 files changed, 8 insertions, 2 deletions
diff --git a/src/libskabus/skabus_rpc_get.c b/src/libskabus/skabus_rpc_get.c
index d780211..132597a 100644
--- a/src/libskabus/skabus_rpc_get.c
+++ b/src/libskabus/skabus_rpc_get.c
@@ -2,6 +2,7 @@
 
 #include <stdint.h>
 #include <errno.h>
+#include <skalibs/error.h>
 #include <skalibs/gensetdyn.h>
 #include <skalibs/avltree.h>
 #include <skabus/rpc.h>
@@ -10,9 +11,14 @@ int skabus_rpc_get (skabus_rpc_t *a, uint64_t serial, int *result, unixmessage_t
 {
   uint32_t id ;
   skabus_rpc_qinfo_t *p ;
-  if (!avltree_search(&a->qmap, &serial, &id)) return 0 ;
+  if (!avltree_search(&a->qmap, &serial, &id))
+  {
+    if (errno == ESRCH) errno = EINVAL ;
+    return -1 ;
+  }
   p = GENSETDYN_P(skabus_rpc_qinfo_t, &a->q, id) ;
-  if (p->status) return (errno = p->status, 0) ;
+  if (p->status)
+    return error_isagain(p->status) ? 0 : (errno = p->status, -1) ;
   *result = (int)(unsigned char)p->result ;
   *m = p->message ;
   return 1 ;