Fix issue when FileWatch is absent