diff --git a/src/main.rs b/src/main.rs
index f051f9c..c5a25bf 100644
--- a/src/main.rs
+++ b/src/main.rs
@@ -332,10 +332,19 @@ async fn prep_song(
                     };
                     */
 
-                    let queued_song = queued_item::QueuedSong {
+                    let queued_song: crate::queued_item::QueuedSong = match song.save_to_filesystem() {
+                        Ok(_) => {
+                        queued_item::QueuedSong {
                         id: *song_queue_id,
                         song,
                         path: songpath
+                    }
+
+                        }
+                        Err(err) => {
+                            eprintln!("Error: {err:?}");
+                            queued_item::QueuedSong{..Default::default()}
+                        }
                     };
 
                     println!("Saved at: {:?}", queued_song.path);
diff --git a/src/queued_item.rs b/src/queued_item.rs
index 2c07162..3c4e13b 100644
--- a/src/queued_item.rs
+++ b/src/queued_item.rs
@@ -1,11 +1,11 @@
-#[derive(Clone, Debug)]
+#[derive(Clone, Debug, Default)]
 pub struct QueuedSong {
     pub id: uuid::Uuid,
     pub song: icarus_models::song::Song,
     pub path: String,
 }
 
-#[derive(Clone, Debug)]
+#[derive(Clone, Debug, Default)]
 pub struct QueuedCoverArt {
     pub id: uuid::Uuid,
     pub coverart: icarus_models::coverart::CoverArt,