diff --git a/src/database/mod.rs b/src/database/mod.rs
index 52504c1..c9b8ac5 100644
--- a/src/database/mod.rs
+++ b/src/database/mod.rs
@@ -75,14 +75,14 @@ type DbPool = r2d2::Pool<ConnectionManager<SqliteConnection>>;
 
 #[derive(Debug)]
 pub struct LoggingHandler {
-    pub target: &'static str,
+    pub name: &'static str,
 }
 
 impl diesel::r2d2::HandleError<diesel::r2d2::Error> for LoggingHandler {
     fn handle_error(&self, error: diesel::r2d2::Error) {
-        error!(target: self.target, "{}", error);
+        error!(name = self.name, "Database error: {}", error);
         if is_debug() {
-            panic!("This should not happen! {}", error);
+            panic!("Database error! This should not happen! {}", error);
         }
     }
 }
@@ -127,9 +127,7 @@ impl UpEndDatabase {
                 enable_foreign_keys: true,
                 busy_timeout: Some(Duration::from_secs(30)),
             }))
-            .error_handler(Box::new(LoggingHandler {
-                target: "upend::db::main",
-            }))
+            .error_handler(Box::new(LoggingHandler { name: "main" }))
             .build(manager)?;
         trace!("Pool created.");
 
diff --git a/src/database/stores/fs/mod.rs b/src/database/stores/fs/mod.rs
index e1c6b21..27a18ed 100644
--- a/src/database/stores/fs/mod.rs
+++ b/src/database/stores/fs/mod.rs
@@ -122,9 +122,7 @@ impl FsStore {
 
         let pool = r2d2::Pool::builder()
             .connection_customizer(Box::new(ConnectionOptions {}))
-            .error_handler(Box::new(LoggingHandler {
-                target: "upend::db::fs",
-            }))
+            .error_handler(Box::new(LoggingHandler { name: "fs_store" }))
             .build(manager)?;
 
         let lock = Arc::new(RwLock::new(()));