diff --git a/.gitattributes b/.gitattributes
index 05a4bff688f053c37c75b85070250b2bf383a3be..dc7e03e1b84eac27c116048a515bd718707c3027 100644
--- a/.gitattributes
+++ b/.gitattributes
@@ -7,5 +7,4 @@
 # Files containing CVS ids follow.
 # Remove the corresponding line before committing
 # changes to these files.
-/lib/modules/Filesystem.pmod/Monitor.pmod/basic.pike foreign_ident
 /lib/modules/Filesystem.pmod/Monitor.pmod/symlinks.pike foreign_ident
diff --git a/lib/modules/Filesystem.pmod/Monitor.pmod/basic.pike b/lib/modules/Filesystem.pmod/Monitor.pmod/basic.pike
index 09a68e5ff2dfb26729267f9fd5e80cb8bf654c87..3477a309949e1c8e987ca4389f339db0db741d9f 100644
--- a/lib/modules/Filesystem.pmod/Monitor.pmod/basic.pike
+++ b/lib/modules/Filesystem.pmod/Monitor.pmod/basic.pike
@@ -1,7 +1,7 @@
 //
 // Basic filesystem monitor.
 //
-// $Id: basic.pike,v 1.38 2010/04/27 15:00:54 grubba Exp $
+// $Id$
 //
 // 2009-07-09 Henrik Grubbstr�m
 //
@@ -310,7 +310,7 @@ protected class Monitor(string path,
     next_poll -= seconds || 30;
     monitor_queue->adjust(this);
 
-    if ((flags & MF_RECURSE) && st->isdir && files) {
+    if ((flags & MF_RECURSE) && st && st->isdir && files) {
       // Bump the files in the directory as well.
       foreach(files, string file) {
 	file = canonic_path(Stdio.append_path(path, file));