Fix exception handling when polling for server status

Fix watch service to remove events from watcher