diff --git a/apps/liteprotocoltester/liteprotocoltester.nim b/apps/liteprotocoltester/liteprotocoltester.nim
index adb1b0f8a..46c85e910 100644
--- a/apps/liteprotocoltester/liteprotocoltester.nim
+++ b/apps/liteprotocoltester/liteprotocoltester.nim
@@ -130,7 +130,8 @@ when isMainModule:
   info "Setting up shutdown hooks"
 
   proc asyncStopper(waku: Waku) {.async: (raises: [Exception]).} =
-    await waku.stop()
+    (await waku.stop()).isOkOr:
+      error "Waku shutdown failed", error = error
     quit(QuitSuccess)
 
   # Handle Ctrl-C SIGINT
@@ -160,7 +161,8 @@ when isMainModule:
       # Not available in -d:release mode
       writeStackTrace()
 
-      waitFor waku.stop()
+      (waitFor waku.stop()).isOkOr:
+        error "Waku shutdown failed", error = error
       quit(QuitFailure)
 
     c_signal(ansi_c.SIGSEGV, handleSigsegv)
diff --git a/apps/wakunode2/wakunode2.nim b/apps/wakunode2/wakunode2.nim
index b50c7113b..c8132ff4e 100644
--- a/apps/wakunode2/wakunode2.nim
+++ b/apps/wakunode2/wakunode2.nim
@@ -62,7 +62,8 @@ when isMainModule:
 
     info "Setting up shutdown hooks"
     proc asyncStopper(waku: Waku) {.async: (raises: [Exception]).} =
-      await waku.stop()
+      (await waku.stop()).isOkOr:
+        error "Waku shutdown failed", error = error
       quit(QuitSuccess)
 
     # Handle Ctrl-C SIGINT
@@ -92,7 +93,8 @@ when isMainModule:
         # Not available in -d:release mode
         writeStackTrace()
 
-        waitFor waku.stop()
+        (waitFor waku.stop()).isOkOr:
+          error "Waku shutdown failed", error = error
         quit(QuitFailure)
 
       c_signal(ansi_c.SIGSEGV, handleSigsegv)
diff --git a/tests/wakunode2/test_app.nim b/tests/wakunode2/test_app.nim
index b16880787..11ea2d93b 100644
--- a/tests/wakunode2/test_app.nim
+++ b/tests/wakunode2/test_app.nim
@@ -60,7 +60,8 @@ suite "Wakunode2 - Waku initialization":
       not node.wakuRendezvous.isNil()
 
     ## Cleanup
-    waitFor waku.stop()
+    (waitFor waku.stop()).isOkOr:
+      raiseAssert error
 
   test "app properly handles dynamic port configuration":
     ## Given
@@ -96,4 +97,5 @@ suite "Wakunode2 - Waku initialization":
       typedNodeEnr.get().tcp.get() != 0
 
     ## Cleanup
-    waitFor waku.stop()
+    (waitFor waku.stop()).isOkOr:
+      raiseAssert error)
diff --git a/vendor/nim-chronos b/vendor/nim-chronos
index 0646c444f..85af4db76 160000
--- a/vendor/nim-chronos
+++ b/vendor/nim-chronos
@@ -1 +1 @@
-Subproject commit 0646c444fce7c7ed08ef6f2c9a7abfd172ffe655
+Subproject commit 85af4db764ecd3573c4704139560df3943216cf1
diff --git a/vendor/nim-libp2p b/vendor/nim-libp2p
index 0309685cd..eb7e6ff89 160000
--- a/vendor/nim-libp2p
+++ b/vendor/nim-libp2p
@@ -1 +1 @@
-Subproject commit 0309685cd27d4bf763c8b3be86a76c33bcfe67ea
+Subproject commit eb7e6ff89889e41b57515f891ba82986c54809fb