diff --git a/gnu/gnunet/common.scm b/gnu/gnunet/common.scm
index 74fcfd0..fc54f5c 100644
--- a/gnu/gnunet/common.scm
+++ b/gnu/gnunet/common.scm
@@ -64,8 +64,8 @@
 (define gnunet-yes           1)
 (define gnunet-no            0)
 
-(define gnunet-util-ffi (dynamic-link "/usr/local/lib/libgnunetutil"))
-(define gnunet-fs-ffi   (dynamic-link "/usr/local/lib/libgnunetfs"))
+(define gnunet-util-ffi (dynamic-link "libgnunetutil"))
+(define gnunet-fs-ffi   (dynamic-link "libgnunetfs"))
 
 
 (define-syntax define-foreign-definer
diff --git a/gnu/gnunet/scheduler.scm b/gnu/gnunet/scheduler.scm
index 10ef6a8..94c147a 100644
--- a/gnu/gnunet/scheduler.scm
+++ b/gnu/gnunet/scheduler.scm
@@ -85,9 +85,12 @@
     (#:prerequisite-done . 32)))
 
 (define (reason-list->number . reasons)
+  (define (reason->number r)
+    (or (assq-ref reasons-alist r)
+        (throw 'invalid-arg "reason->number" r)))
   (fold (lambda (reason result)
-	  (logand (assq-ref reasons-alist reason) result))
-	0 reasons-alist))
+	  (logand (reason->number reason) result))
+	0 reasons))
 
 (define (number->reason-list n)
   (fold (lambda (reason result)