diff --git a/core/lib/Drupal/Core/Field/Plugin/Field/FieldType/PasswordItem.php b/core/lib/Drupal/Core/Field/Plugin/Field/FieldType/PasswordItem.php
index a7c8460a7c48416bca63aa31bb39efdfcd65214e..a846a6f06240ca499799a0f95a64bcc016f20167 100644
--- a/core/lib/Drupal/Core/Field/Plugin/Field/FieldType/PasswordItem.php
+++ b/core/lib/Drupal/Core/Field/Plugin/Field/FieldType/PasswordItem.php
@@ -56,7 +56,7 @@ public function preSave() {
       $this->value = \Drupal::service('password')->hash(trim($this->value));
       // Abort if the hashing failed and returned FALSE.
       if (!$this->value) {
-        throw new EntityMalformedException('The entity does not have a password.');
+        throw new EntityMalformedException(sprintf("Failed to hash the %s password.", $entity->getEntityType()->getLabel()));
       }
     }
 
diff --git a/core/tests/Drupal/KernelTests/Core/Field/FieldType/PasswordItemTest.php b/core/tests/Drupal/KernelTests/Core/Field/FieldType/PasswordItemTest.php
index c3d6fc47392fd005666a207285e7c1c07d989c31..2eaada39c34b9d26077c7f20ff402c524667bcc7 100644
--- a/core/tests/Drupal/KernelTests/Core/Field/FieldType/PasswordItemTest.php
+++ b/core/tests/Drupal/KernelTests/Core/Field/FieldType/PasswordItemTest.php
@@ -168,7 +168,7 @@ public function testPreSaveExceptionNew(): void {
     $entity = EntityTest::create();
     $entity->test_field = str_repeat('a', PasswordInterface::PASSWORD_MAX_LENGTH + 1);
     $this->expectException(EntityStorageException::class);
-    $this->expectExceptionMessage('The entity does not have a password');
+    $this->expectExceptionMessage('Failed to hash the Test entity password.');
     $entity->save();
   }
 
@@ -183,7 +183,7 @@ public function testPreSaveExceptionExisting(): void {
     $this->assertNotEquals('will_be_hashed', $entity->test_field->value);
 
     $this->expectException(EntityStorageException::class);
-    $this->expectExceptionMessage('The entity does not have a password');
+    $this->expectExceptionMessage('Failed to hash the Test entity password.');
     $entity->test_field = str_repeat('a', PasswordInterface::PASSWORD_MAX_LENGTH + 1);
     $entity->save();
   }