diff --git a/src/MediaHandler/Support/Filesystem.php b/src/MediaHandler/Support/Filesystem.php
index 08890df..e2ae111 100644
--- a/src/MediaHandler/Support/Filesystem.php
+++ b/src/MediaHandler/Support/Filesystem.php
@@ -50,7 +50,7 @@ public function deleteFromMediaLibrary(Media $media)
 
         // Check if main media folder is empty, if so, delete it
         $mainDisk = $this->filesystem->disk($media->disk);
-        if ($mainDisk->exists($media->path)) {
+        if (!empty($media->path) && $mainDisk->exists($media->path)) {
             $fileCount = count($convDisk->files($media->path));
             $dirCount = count(array_filter(
                 $convDisk->allDirectories($media->path),
@@ -111,7 +111,9 @@ public function getMediaDirectory(Media $media, ?string $type = null): string
             ? $media->disk
             : $media->conversions_disk;
 
-        $this->filesystem->disk($diskName)->makeDirectory($directory);
+        if (!empty($directory)) {
+            $this->filesystem->disk($diskName)->makeDirectory($directory);
+        }
 
         return $directory;
     }