diff --git a/src/profile.rs b/src/profile.rs
index 69198b64..4834df60 100644
--- a/src/profile.rs
+++ b/src/profile.rs
@@ -72,9 +72,9 @@ impl Profile {
         let database = Rc::new(Database::build(&connection));
 
         // Get active profile or create new one
-        let profile_id = Rc::new(match database.active().unwrap() {
+        let profile_id = Rc::new(match database.active()? {
             Some(profile) => profile.id,
-            None => match database.add(true, DateTime::now_local().unwrap(), None) {
+            None => match database.add(true, DateTime::now_local()?, None) {
                 Ok(id) => id,
                 Err(e) => todo!("{:?}", e),
             },
@@ -83,7 +83,7 @@ impl Profile {
         // Init components
         let bookmark = Rc::new(Bookmark::build(&connection, &profile_id)?);
         let history = Rc::new(History::build(&connection, &profile_id));
-        let search = Rc::new(Search::build(&connection, &profile_id).unwrap()); // @TODO handle
+        let search = Rc::new(Search::build(&connection, &profile_id)?); // @TODO handle
         let identity = Rc::new(match Identity::build(&connection, &profile_id) {
             Ok(result) => result,
             Err(e) => todo!("{:?}", e.to_string()),
diff --git a/src/profile/bookmark.rs b/src/profile/bookmark.rs
index 059db8e5..e2effa07 100644
--- a/src/profile/bookmark.rs
+++ b/src/profile/bookmark.rs
@@ -52,10 +52,7 @@ impl Bookmark {
             }
         // Otherwise, create new record
         } else {
-            match self
-                .database
-                .add(DateTime::now_local().unwrap(), request.into())
-            {
+            match self.database.add(DateTime::now_local()?, request.into()) {
                 Ok(id) => match self.memory.add(request.into(), id) {
                     Ok(_) => Ok(true),
                     Err(_) => panic!(), // unexpected
diff --git a/src/profile/identity.rs b/src/profile/identity.rs
index f5b45711..32dd05c6 100644
--- a/src/profile/identity.rs
+++ b/src/profile/identity.rs
@@ -77,8 +77,8 @@ impl Identity {
             match time {
                 Some(value) => value,
                 None => (
-                    DateTime::now_local().unwrap(),
-                    DateTime::from_local(9999, 12, 31, 23, 59, 59.9).unwrap(), // max @TODO
+                    DateTime::now_local()?,
+                    DateTime::from_local(9999, 12, 31, 23, 59, 59.9)?, // max @TODO
                 ),
             },
             name,