diff --git a/core/src/main/groovy/com/muwire/core/Core.groovy b/core/src/main/groovy/com/muwire/core/Core.groovy
index 4dd272a5..287ef738 100644
--- a/core/src/main/groovy/com/muwire/core/Core.groovy
+++ b/core/src/main/groovy/com/muwire/core/Core.groovy
@@ -246,9 +246,10 @@ public class Core {
         connectionAcceptor.stop()
         log.info("shutting down connection establisher")
         connectionEstablisher.stop()
+        log.info("shutting down directory watcher")
+        directoryWatcher.stop()
         log.info("shutting down connection manager")
         connectionManager.shutdown()
-        directoryWatcher.stop()
     }
 
     static main(args) {