diff --git a/hammond-gtk/src/app.rs b/hammond-gtk/src/app.rs
index 3b2a979..c531a1e 100644
--- a/hammond-gtk/src/app.rs
+++ b/hammond-gtk/src/app.rs
@@ -278,7 +278,10 @@ impl App {
                     let notif = InAppNotification::new(&err, callback, || {}, UndoState::Hidden);
                     notif.show(&self.overlay);
                 }
-                Action::InitEpisode(rowid) => self.player.initialize_episode(rowid).unwrap(),
+                Action::InitEpisode(rowid) => {
+                    let res = self.player.initialize_episode(rowid);
+                    debug_assert!(res.is_ok());
+                }
                 Action::InitShowMenu(s) => {
                     let menu = s.borrow();
                     self.headerbar.set_secondary_menu(&menu.container);
diff --git a/hammond-gtk/src/prefs.rs b/hammond-gtk/src/prefs.rs
index f075430..2ef17f3 100644
--- a/hammond-gtk/src/prefs.rs
+++ b/hammond-gtk/src/prefs.rs
@@ -70,9 +70,11 @@ impl Prefs {
         self.cleanup_type.set_active(cleanup_pos);
         self.cleanup_type
             .connect_changed(clone!(settings, store => move |combo| {
-            let value = store.get_value(&combo.get_active_iter().unwrap(), 0);
-            let value: &str = value.get().unwrap();
-            settings.set_string("cleanup-age-period", &value.to_lowercase());
+                if let Some(ref treeiter) = combo.get_active_iter() {
+                    if let Some(s) = store.get_value(treeiter, 0).get::<&str>() {
+                        settings.set_string("cleanup-age-period", &s.to_lowercase());
+                    }
+                };
         }));
     }