diff --git a/core/modules/workspace/src/EntityOperations.php b/core/modules/workspace/src/EntityOperations.php
index d954afe..7137d78 100644
--- a/core/modules/workspace/src/EntityOperations.php
+++ b/core/modules/workspace/src/EntityOperations.php
@@ -145,7 +145,7 @@ public function entityPresave(EntityInterface $entity) {
     // Disallow any change to an unsupported entity when we are not in the
     // default workspace.
     if (!$this->workspaceManager->isEntityTypeSupported($entity_type)) {
-      throw new WorkspaceStorageException('This entity can only be saved in the default workspace.');
+      throw new \RuntimeException('This entity can only be saved in the default workspace.');
     }
 
     /** @var \Drupal\Core\Entity\RevisionableInterface|\Drupal\Core\Entity\EntityPublishedInterface $entity */
@@ -251,7 +251,7 @@ public function entityPredelete(EntityInterface $entity) {
     // Disallow any change to an unsupported entity when we are not in the
     // default workspace.
     if (!$this->workspaceManager->isEntityTypeSupported($entity_type)) {
-      throw new WorkspaceStorageException('This entity can only be deleted in the default workspace.');
+      throw new \RuntimeException('This entity can only be deleted in the default workspace.');
     }
   }
 
@@ -357,6 +357,8 @@ public function formAlter(array &$form, FormStateInterface $form_state, $form_id
    * Validation handler for forms that do not handle a supported entity type.
    */
   public function validateForm(array &$form, FormStateInterface $form_state) {
+    // The exception in ::entityPresave() is thrown upon submission of the form,
+    // at which point we can longer transform it into a valiation error.
     $form_state->setError($form, $this->t('This form can only be submitted in the default workspace.'));
   }
 
diff --git a/core/modules/workspace/src/WorkspaceStorageException.php b/core/modules/workspace/src/WorkspaceStorageException.php
deleted file mode 100644
index a4a76f3..0000000
--- a/core/modules/workspace/src/WorkspaceStorageException.php
+++ /dev/null
@@ -1,10 +0,0 @@
-<?php
-
-namespace Drupal\workspace;
-
-use Drupal\Core\Entity\EntityStorageException;
-
-/**
- * Thrown when entity storage operations fail in the context of a workspace.
- */
-class WorkspaceStorageException extends EntityStorageException {}
diff --git a/core/modules/workspace/tests/src/Kernel/WorkspaceIntegrationTest.php b/core/modules/workspace/tests/src/Kernel/WorkspaceIntegrationTest.php
index a154b72..47d5245 100644
--- a/core/modules/workspace/tests/src/Kernel/WorkspaceIntegrationTest.php
+++ b/core/modules/workspace/tests/src/Kernel/WorkspaceIntegrationTest.php
@@ -2,6 +2,7 @@
 
 namespace Drupal\Tests\workspace\Kernel;
 
+use Drupal\Core\Entity\EntityStorageException;
 use Drupal\entity_test\Entity\EntityTestMulRev;
 use Drupal\entity_test\Entity\EntityTestMulRevPub;
 use Drupal\field\Tests\EntityReference\EntityReferenceTestTrait;
@@ -12,7 +13,6 @@
 use Drupal\views\Tests\ViewResultAssertionTrait;
 use Drupal\views\Views;
 use Drupal\workspace\Entity\Workspace;
-use Drupal\workspace\WorkspaceStorageException;
 
 /**
  * Tests a complete deployment scenario across different workspaces.
@@ -473,7 +473,7 @@ public function testDisallowedEntityCRUDInNonDefaultWorkspace() {
     // Check updating an existing entity.
     $entity_test->name->value = 'stage entity_test_mulrev';
     $entity_test->setNewRevision(TRUE);
-    $this->expectException(WorkspaceStorageException::class);
+    $this->expectException(EntityStorageException::class);
     $this->expectExceptionMessage('This entity can only be saved in the default workspace.');
     $entity_test->save();
 
@@ -481,12 +481,12 @@ public function testDisallowedEntityCRUDInNonDefaultWorkspace() {
     $new_entity_test = EntityTestMulRev::create([
       'name' => 'stage entity_test_mulrev',
     ]);
-    $this->expectException(WorkspaceStorageException::class);
+    $this->expectException(EntityStorageException::class);
     $this->expectExceptionMessage('This entity can only be saved in the default workspace.');
     $new_entity_test->save();
 
     // Check deleting an existing entity.
-    $this->expectException(WorkspaceStorageException::class);
+    $this->expectException(EntityStorageException::class);
     $this->expectExceptionMessage('This entity can only be deleted in the default workspace.');
     $entity_test->delete();
   }