diff --git a/storagedriver/filesystem/driver.go b/storagedriver/filesystem/driver.go
index 3c3c950fe..0fb5e6fca 100644
--- a/storagedriver/filesystem/driver.go
+++ b/storagedriver/filesystem/driver.go
@@ -201,6 +201,9 @@ func (d *Driver) List(subPath string) ([]string, error) {
 
 	dir, err := os.Open(fullPath)
 	if err != nil {
+		if os.IsNotExist(err) {
+			return nil, storagedriver.PathNotFoundError{Path: subPath}
+		}
 		return nil, err
 	}