Cleanup guard process anytime

lib/guard/commander.rb

@@ -47,8 +47,9 @@ module Guard
         exitcode = e.status
       end
-      stop
       exitcode
+    ensure
+      stop
     end
     def stop

lib/guard/notifier.rb

@@ -16,7 +16,7 @@ module Guard
     end
     def self.disconnect
-      @notifier.disconnect
+      @notifier && @notifier.disconnect
       @notifier = nil
     end