diff --git a/src/fail.rs b/src/fail.rs
index 4e4cdc5..bfb3a33 100644
--- a/src/fail.rs
+++ b/src/fail.rs
@@ -7,6 +7,5 @@ macro_rules! fail {
 }
 
 fail!(connect addr = "Failed to connect to {}");
-fail!(parse_addr addr = "Faield to parse {} as an address");
 fail!(parse_cfg path = "Failed to parse configuration file {}");
 fail!(read path = "Failed to read file {}");
diff --git a/src/main.rs b/src/main.rs
index 0364b32..fb18056 100644
--- a/src/main.rs
+++ b/src/main.rs
@@ -25,7 +25,7 @@ use tokio::{
 };
 use tui::{backend::CrosstermBackend, widgets::ListState, Terminal};
 
-use std::{cmp::min, fs, io::stdout, process::exit};
+use std::{cmp::min, fs, io::stdout, net::SocketAddr, process::exit};
 
 use crate::{config::Config, mpd::Client};
 
@@ -57,7 +57,7 @@ struct Opts {
 
     /// Specify the address of the mpd server
     #[structopt(long, value_name = "address")]
-    address: Option<String>,
+    address: Option<SocketAddr>,
 
     /// Specify the config file
     #[structopt(short, long, value_name = "file")]
@@ -154,11 +154,7 @@ async fn run() -> Result<()> {
         defaults::config()
     };
 
-    let addr = &if let Some(addr) = opts.address {
-        addr.parse().with_context(fail::parse_addr(addr))?
-    } else {
-        cfg.address
-    };
+    let addr = &opts.address.unwrap_or(cfg.address);
     let mut idle_cl = Client::init(addr).await?;
     let mut cl = Client::init(addr).await?;