diff --git a/src/libstd/os.rs b/src/libstd/os.rs
index a82f1c9891696c3df23660e423e0d64b0b9bc5ea..44acdd4d6173e09766291c03aa5600b1ee690fd6 100644
--- a/src/libstd/os.rs
+++ b/src/libstd/os.rs
@@ -675,6 +675,11 @@ pub fn mkdir_recursive(p: &Path, mode: c_int) -> bool {
 /// Lists the contents of a directory
 #[allow(non_implicitly_copyable_typarams)]
 pub fn list_dir(p: &Path) -> ~[~str] {
+    if p.components.is_empty() && !p.is_absolute() {
+        // Not sure what the right behavior is here, but this
+        // prevents a bounds check failure later
+        return ~[];
+    }
     unsafe {
         #[cfg(target_os = "linux")]
         #[cfg(target_os = "android")]
@@ -1596,6 +1601,26 @@ fn list_dir() {
         }
     }
 
+    #[test]
+    fn list_dir_empty_path() {
+        let dirs = os::list_dir(&Path(""));
+        assert!(dirs.is_empty());
+    }
+
+    #[test]
+    #[cfg(not(windows))]
+    fn list_dir_root() {
+        let dirs = os::list_dir(&Path("/"));
+        assert!(dirs.len() > 1);
+    }
+    #[test]
+    #[cfg(windows)]
+    fn list_dir_root() {
+        let dirs = os::list_dir(&Path("C:\\"));
+        assert!(dirs.len() > 1);
+    }
+
+
     #[test]
     fn path_is_dir() {
         assert!((os::path_is_dir(&Path("."))));