diff --git a/core/lib/Drupal/Core/Entity/EntityType.php b/core/lib/Drupal/Core/Entity/EntityType.php
index 3a32d4a..140ca2b 100644
--- a/core/lib/Drupal/Core/Entity/EntityType.php
+++ b/core/lib/Drupal/Core/Entity/EntityType.php
@@ -248,6 +248,9 @@ public function __construct($definition) {
     }
 
     foreach ($definition as $property => $value) {
+      if (!property_exists($this, $property)) {
+        throw new \InvalidArgumentException(sprintf('"%s" property does not exist on %s. Change the entity annotation for "%s" or extend this class.', $property, get_class($this), $definition['id']));
+      }
       $this->{$property} = $value;
     }
 
diff --git a/core/lib/Drupal/Core/Field/Entity/BaseFieldOverride.php b/core/lib/Drupal/Core/Field/Entity/BaseFieldOverride.php
index ecf7665..751693d 100644
--- a/core/lib/Drupal/Core/Field/Entity/BaseFieldOverride.php
+++ b/core/lib/Drupal/Core/Field/Entity/BaseFieldOverride.php
@@ -20,7 +20,7 @@
  * @ConfigEntityType(
  *   id = "base_field_override",
  *   label = @Translation("Base field override"),
- *   controllers = {
+ *   handlers = {
  *     "storage" = "Drupal\Core\Field\BaseFieldOverrideStorage"
  *   },
  *   config_prefix = "base_field_override",