1 files changed, 7 insertions, 1 deletions
diff --git a/src/lib.rs b/src/lib.rs
index 6a29067..d417164 100644
--- a/src/lib.rs
+++ b/src/lib.rs
@@ -770,7 +770,13 @@ pub fn get_mpd_current(config: &Config) -> String {
         Ok(connection) => connection,
         _ => return String::from(""),
     };
-    let current: Song = conn.currentsong().unwrap().unwrap();
+    let current: Song = match conn.currentsong() {
+        Ok(opt) => match opt {
+            Some(song) => song,
+            _ => return String::from(""),
+        },
+        _ => return String::from(""),
+    };
 
     let result = format!(
         "  {}  {}  {}",