diff --git a/src/error.rs b/src/error.rs
index 09f80b0a..f8aff775 100644
--- a/src/error.rs
+++ b/src/error.rs
@@ -3,6 +3,7 @@ pub enum DbErr {
     Conn(String),
     Exec(String),
     Query(String),
+    RecordNotFound(String),
 }
 
 impl std::error::Error for DbErr {}
@@ -13,6 +14,7 @@ impl std::fmt::Display for DbErr {
             Self::Conn(s) => write!(f, "Connection Error: {}", s),
             Self::Exec(s) => write!(f, "Execution Error: {}", s),
             Self::Query(s) => write!(f, "Query Error: {}", s),
+            Self::RecordNotFound(s) => write!(f, "RecordNotFound Error: {}", s),
         }
     }
 }
diff --git a/src/executor/insert.rs b/src/executor/insert.rs
index d580f110..a44867f7 100644
--- a/src/executor/insert.rs
+++ b/src/executor/insert.rs
@@ -1,6 +1,6 @@
 use crate::{
-    error::*, ActiveModelTrait, DatabaseConnection, DbBackend, EntityTrait, Insert, PrimaryKeyTrait,
-    Statement, TryFromU64,
+    error::*, ActiveModelTrait, DatabaseConnection, DbBackend, EntityTrait, Insert,
+    PrimaryKeyTrait, Statement, TryFromU64,
 };
 use sea_query::InsertStatement;
 use std::{future::Future, marker::PhantomData};
diff --git a/src/executor/update.rs b/src/executor/update.rs
index 6c7a9873..c6668d6b 100644
--- a/src/executor/update.rs
+++ b/src/executor/update.rs
@@ -73,6 +73,11 @@ where
 // Only Statement impl Send
 async fn exec_update(statement: Statement, db: &DatabaseConnection) -> Result<UpdateResult, DbErr> {
     let result = db.execute(statement).await?;
+    if result.rows_affected() <= 0 {
+        return Err(DbErr::RecordNotFound(
+            "None of the database rows are affected".to_owned(),
+        ));
+    }
     Ok(UpdateResult {
         rows_affected: result.rows_affected(),
     })
diff --git a/tests/crud/updates.rs b/tests/crud/updates.rs
index c2048f9b..262031ef 100644
--- a/tests/crud/updates.rs
+++ b/tests/crud/updates.rs
@@ -1,5 +1,6 @@
 pub use super::*;
 use rust_decimal_macros::dec;
+use sea_orm::DbErr;
 use uuid::Uuid;
 
 pub async fn test_update_cake(db: &DbConn) {
@@ -119,10 +120,14 @@ pub async fn test_update_deleted_customer(db: &DbConn) {
         ..Default::default()
     };
 
-    let _customer_update_res: customer::ActiveModel = customer
-        .update(db)
-        .await
-        .expect("could not update customer");
+    let customer_update_res = customer.update(db).await;
+
+    assert_eq!(
+        customer_update_res,
+        Err(DbErr::RecordNotFound(
+            "None of the database rows are affected".to_owned()
+        ))
+    );
 
     assert_eq!(Customer::find().count(db).await.unwrap(), init_n_customers);
 
diff --git a/tests/uuid_tests.rs b/tests/uuid_tests.rs
index e58daca4..052f57d7 100644
--- a/tests/uuid_tests.rs
+++ b/tests/uuid_tests.rs
@@ -1,7 +1,7 @@
 pub mod common;
 
 pub use common::{bakery_chain::*, setup::*, TestContext};
-use sea_orm::{entity::prelude::*, DatabaseConnection, IntoActiveModel};
+use sea_orm::{entity::prelude::*, DatabaseConnection, IntoActiveModel, Set};
 
 #[sea_orm_macros::test]
 #[cfg(any(
@@ -40,5 +40,20 @@ pub async fn create_metadata(db: &DatabaseConnection) -> Result<(), DbErr> {
         }
     );
 
+    let update_res = Metadata::update(metadata::ActiveModel {
+        value: Set("0.22".to_owned()),
+        ..metadata.clone().into_active_model()
+    })
+    .filter(metadata::Column::Uuid.eq(Uuid::default()))
+    .exec(db)
+    .await;
+
+    assert_eq!(
+        update_res,
+        Err(DbErr::RecordNotFound(
+            "None of the database rows are affected".to_owned()
+        ))
+    );
+
     Ok(())
 }