diff --git a/hammond-gtk/src/app.rs b/hammond-gtk/src/app.rs
index 02edbfa..169ac24 100644
--- a/hammond-gtk/src/app.rs
+++ b/hammond-gtk/src/app.rs
@@ -46,7 +46,7 @@ pub struct App {
 impl App {
     pub fn new() -> App {
         let application = gtk::Application::new("org.gnome.Hammond", ApplicationFlags::empty())
-            .expect("Initialization failed...");
+            .expect("Application Initialization failed...");
 
         // Weird magic I copy-pasted that sets the Application Name in the Shell.
         glib::set_application_name("Hammond");
diff --git a/hammond-gtk/src/main.rs b/hammond-gtk/src/main.rs
index 67d69c3..eb66a6a 100644
--- a/hammond-gtk/src/main.rs
+++ b/hammond-gtk/src/main.rs
@@ -65,15 +65,15 @@ use app::App;
 
 fn main() {
     // TODO: make the the logger a cli -vv option
-    loggerv::init_with_level(Level::Info).unwrap();
-    gtk::init().expect("Error initializing gtk");
+    loggerv::init_with_level(Level::Info).expect("Error initializing loggerv.");
+    gtk::init().expect("Error initializing gtk.");
     static_resource::init().expect("Something went wrong with the resource file initialization.");
 
     // Add custom style
     let provider = gtk::CssProvider::new();
     gtk::CssProvider::load_from_resource(&provider, "/org/gnome/hammond/gtk/style.css");
     gtk::StyleContext::add_provider_for_screen(
-        &gdk::Screen::get_default().unwrap(),
+        &gdk::Screen::get_default().expect("Error initializing gtk css provider."),
         &provider,
         600,
     );