diff --git a/source/doap/client/client.d b/source/doap/client/client.d
index 3e83367..a38ffe7 100644
--- a/source/doap/client/client.d
+++ b/source/doap/client/client.d
@@ -111,8 +111,13 @@ public class CoapClient
         // Shutdown the messaging layer
         this.messaging.close();
         
-        // TODO: We must wake up other sleeprs with an error
-        // (somehow, pass it in, flag set)
+        // Cancel all active request futures
+        this.requestsLock.lock();
+        foreach(CoapRequest curReq; outgoingRequests)
+        {
+            curReq.future.cancel();
+        }
+        this.requestsLock.unlock();
     }
 
     /**