diff --git a/filesystem/Upload.php b/filesystem/Upload.php
index 397542de3..90cb343dd 100644
--- a/filesystem/Upload.php
+++ b/filesystem/Upload.php
@@ -134,7 +134,7 @@ class Upload extends Controller {
 		$file = $nameFilter->filter($tmpFile['name']);
 		$fileName = basename($file);
 
-		$relativeFilePath = $parentFolder->getRelativePath() . "/$fileName";
+		$relativeFilePath = $parentFolder ? $parentFolder->getRelativePath() . "$fileName" : $fileName;		
 		
 		// Create a new file record (or try to retrieve an existing one)
 		if(!$this->file) {