diff --git a/hphp/runtime/ext/ext_file.cpp b/hphp/runtime/ext/ext_file.cpp
index 1a9b842b5..24b229789 100644
--- a/hphp/runtime/ext/ext_file.cpp
+++ b/hphp/runtime/ext/ext_file.cpp
@@ -1277,6 +1277,7 @@ bool f_chdir(CStrRef directory) {
     g_context->setCwd(File::TranslatePath(directory));
     return true;
   }
+  raise_warning("No such file or directory (errno 2)");
   return false;
 }
 
diff --git a/hphp/test/quick/chdir.php b/hphp/test/quick/chdir.php
new file mode 100644
index 000000000..3a25c947d
--- /dev/null
+++ b/hphp/test/quick/chdir.php
@@ -0,0 +1,3 @@
+<?php
+
+var_dump(chdir('/this_should_not_exist'));
diff --git a/hphp/test/quick/chdir.php.expectf b/hphp/test/quick/chdir.php.expectf
new file mode 100644
index 000000000..12a554df8
--- /dev/null
+++ b/hphp/test/quick/chdir.php.expectf
@@ -0,0 +1,2 @@
+HipHop Warning: No such file or directory (errno 2) in %s/test/quick/chdir.php on line 3
+bool(false)