diff --git a/src/command/session.rs b/src/command/session.rs
index 9d66b16..0c59452 100644
--- a/src/command/session.rs
+++ b/src/command/session.rs
@@ -33,7 +33,7 @@ pub fn switch(state: &mut State) {
 	//TODO: -d flag handling needs to be done manually
 
 	let args = state.args.clone().finish();
-	let target: String = match args.get(0).map(|s| s.to_str().unwrap()) {
+	let target: String = match if let Some(inner) = args.get(0) { inner.to_str() } else { None } {
 		None		|
 		Some("-")	=>	if let Some(prev) = message(MSG_PREVIOUS) { prev }
 						else { error::missing_target(); panic!() },