Issue #2829437 General error: 1364 Field 'plugin' doesn't have a default value...

Issue #2829437 General error: 1364 Field 'plugin' doesn't have a default value applied a patch in https://www.drupal.org/node/2829437#comment-11839684

entity.module

@@ -912,9 +912,11 @@ function _entity_defaults_rebuild($entity_type) {
     $entities = array();
     foreach (module_implements($hook) as $module) {
       foreach ((array) module_invoke($module, $hook) as $name => $entity) {
-        $entity->{$keys['name']} = $name;
-        $entity->{$keys['module']} = $module;
-        $entities[$name] = $entity;
+        if ($entity) {
+          $entity->{$keys['name']} = $name;
+          $entity->{$keys['module']} = $module;
+          $entities[$name] = $entity;
+        }
       }
     }
     drupal_alter($hook, $entities);