diff --git a/code/controllers/AssetAdmin.php b/code/controllers/AssetAdmin.php
index f7f6f6c3..2596e5cb 100644
--- a/code/controllers/AssetAdmin.php
+++ b/code/controllers/AssetAdmin.php
@@ -407,7 +407,11 @@ JS
 		mkdir($record->FullPath);
 		chmod($record->FullPath, Filesystem::$file_create_mask);
 
-		return $this->redirect(Controller::join_links($this->Link('show'), $parentRecord->ID));
+		if($parentRecord) {
+			return $this->redirect(Controller::join_links($this->Link('show'), $parentRecord->ID));
+		} else {
+			return $this->redirect($this->Link());
+		}
 	}
 
 	/**