diff --git a/clients/nym-client/src/clients/mod.rs b/clients/nym-client/src/clients/mod.rs
index a8f0789c5b..4737c7a70a 100644
--- a/clients/nym-client/src/clients/mod.rs
+++ b/clients/nym-client/src/clients/mod.rs
@@ -228,7 +228,7 @@ impl NymClient {
         let provider_client_listener_address: SocketAddr = topology
             .get_mix_provider_nodes()
             .first()
-            .unwrap()
+            .expect("Could not get a provider from the supplied network topology, are you using the right directory server?")
             .client_listener;
 
         let mut provider_client = provider_client::ProviderClient::new(
diff --git a/clients/nym-client/src/commands/mod.rs b/clients/nym-client/src/commands/mod.rs
index 83edeba8a9..1b0fe864f6 100644
--- a/clients/nym-client/src/commands/mod.rs
+++ b/clients/nym-client/src/commands/mod.rs
@@ -1,4 +1,3 @@
 pub mod init;
-pub mod run;
 pub mod tcpsocket;
 pub mod websocket;
diff --git a/clients/nym-client/src/main.rs b/clients/nym-client/src/main.rs
index ad038e45b5..4efac3d1d3 100644
--- a/clients/nym-client/src/main.rs
+++ b/clients/nym-client/src/main.rs
@@ -109,7 +109,6 @@ pub mod built_info {
 fn execute(matches: ArgMatches) -> Result<(), String> {
     match matches.subcommand() {
         ("init", Some(m)) => Ok(commands::init::execute(m)),
-        ("run", Some(m)) => Ok(commands::run::execute(m)),
         ("tcpsocket", Some(m)) => Ok(commands::tcpsocket::execute(m)),
         ("websocket", Some(m)) => Ok(commands::websocket::execute(m)),
         _ => Err(usage()),