diff --git a/src/active_client.rs b/src/active_client.rs
index 0ba46b7..b1a9218 100644
--- a/src/active_client.rs
+++ b/src/active_client.rs
@@ -42,7 +42,9 @@ pub async fn get_active_window(environment: &Environment, config: &Vec<Config>)
                     {
                         Some(window) => match window.app_id {
                             Some(id) => Client::Class(id),
-                            None => Client::Class(window.window_properties.unwrap().class.unwrap()),
+                            None => window.window_properties
+                                .and_then(|window_properties| window_properties.class)
+                                .map_or(Client::Default, Client::Class),
                         },
                         None => Client::Default,
                     };