diff --git a/filesystem/File.php b/filesystem/File.php
index 5e9598a74..e03da57fa 100755
--- a/filesystem/File.php
+++ b/filesystem/File.php
@@ -1,10 +1,10 @@
 <?php
 /**
  * This class handles the representation of a File within Sapphire
- * Note: The files are stored in the "/assets/" directory, but sapphire
+ * Note: The files are stored in the assets/ directory, but sapphire
  * looks at the db object to gather information about a file such as URL
- *
- * It then uses this for all processing functions (like image manipulation)
+ * It then uses this for all processing functions (like image manipulation).
+ * 
  * @package sapphire
  * @subpackage filesystem
  */
@@ -443,6 +443,11 @@ class File extends DataObject {
 		}
 	}
 
+	/**
+	 * Returns 
+	 * 
+	 * @return String
+	 */
 	function getRelativePath() {
 		if($this->ParentID) {
 			$p = DataObject::get_by_id('Folder', $this->ParentID);
diff --git a/filesystem/Folder.php b/filesystem/Folder.php
index 6f496b165..62f5ed67a 100755
--- a/filesystem/Folder.php
+++ b/filesystem/Folder.php
@@ -1,6 +1,7 @@
 <?php
 /**
- * Represents a folder in the assets directory.
+ * Represents a folder in the assets/ directory.
+ * 
  * @package sapphire
  * @subpackage filesystem
  */
@@ -18,11 +19,13 @@ class Folder extends File {
 		$folderPath = trim(Director::makeRelative($folderPath));
 		// replace leading and trailing slashes
 		$folderPath = preg_replace('/^\/?(.*)\/?$/', '$1', $folderPath);
-		
 		$parts = explode("/",$folderPath);
+
 		$parentID = 0;
 
 		foreach($parts as $part) {
+			if(!$part) continue; // happens for paths with a trailing slash
+			
 			$item = DataObject::get_one("Folder", "\"Name\" = '$part' AND \"ParentID\" = $parentID");
 			if(!$item) {
 				$item = new Folder();
@@ -235,7 +238,10 @@ class Folder extends File {
 		}
 	}
 	
-
+	function validate() {
+		return new ValidationResult(true);
+	}
+	
 	//-------------------------------------------------------------------------------------------------
 	// Data Model Definition
 
diff --git a/tests/filesystem/FolderTest.php b/tests/filesystem/FolderTest.php
new file mode 100644
index 000000000..775278946
--- /dev/null
+++ b/tests/filesystem/FolderTest.php
@@ -0,0 +1,36 @@
+<?php
+/**
+ * @author Ingo Schommer (ingo at silverstripe dot com)
+ * @todo There's currently no way to save outside of assets/ folder
+ * 
+ * @package sapphire
+ * @subpackage tests
+ */
+class FolderTest extends SapphireTest {
+	
+	function tearDown() {
+		$testPath = ASSETS_PATH . '/FolderTest';
+		if(file_exists($testPath)) Filesystem::removeFolder($testPath);
+		
+		parent::tearDown();
+	}
+	
+	function testFindOrMake() {
+		$path = '/FolderTest/testFindOrMake/';
+		$folder = Folder::findOrMake($path);
+		$this->assertEquals(ASSETS_DIR . $path,$folder->getRelativePath(),
+			'Nested path information is correctly saved to database (with trailing slash)'
+		);
+
+		$this->assertTrue(file_exists(ASSETS_PATH . $path), 'File');
+		$parentFolder = DataObject::get_one('Folder', '"Name" = \'FolderTest\'');
+		$this->assertNotNull($parentFolder);
+		$this->assertEquals($parentFolder->ID, $folder->ParentID);
+		
+		$path = '/FolderTest/testFindOrMake';
+		$folder = Folder::findOrMake($path);
+		$this->assertEquals(ASSETS_DIR . $path . '/',$folder->getRelativePath(),
+			'Path information is correctly saved to database (without trailing slash)'
+		);
+	}
+}
\ No newline at end of file