diff --git a/source/lib/res/vfs.cpp b/source/lib/res/vfs.cpp
index 0888e13c85..00207bf538 100755
--- a/source/lib/res/vfs.cpp
+++ b/source/lib/res/vfs.cpp
@@ -419,7 +419,7 @@ struct TDir
 	TDir()
 	{
 #ifndef NO_DIR_WATCH
-		watch = -1;
+		watch = 0;	// not yet initialized
 #endif
 		loc = 0;
 		exact_dir_name = 0;	// safety
diff --git a/source/lib/sysdep/win/wdir_watch.cpp b/source/lib/sysdep/win/wdir_watch.cpp
index 9049e92c86..2725994408 100755
--- a/source/lib/sysdep/win/wdir_watch.cpp
+++ b/source/lib/sysdep/win/wdir_watch.cpp
@@ -247,7 +247,7 @@ fail:
 
 int dir_cancel_watch(const intptr_t reqnum)
 {
-	if(reqnum < 0)
+	if(reqnum <= 0)
 		return ERR_INVALID_PARAM;
 
 	Watch* w = watches[reqnum];