diff --git a/core/modules/migrate/src/Plugin/migrate/destination/EntityComment.php b/core/modules/migrate/src/Plugin/migrate/destination/EntityComment.php
index 451f2d5..26e4f3d 100644
--- a/core/modules/migrate/src/Plugin/migrate/destination/EntityComment.php
+++ b/core/modules/migrate/src/Plugin/migrate/destination/EntityComment.php
@@ -30,6 +30,27 @@ class EntityComment extends EntityContentBase {
   protected $state;
 
   /**
+   * The entity ID used for 'commented entity' objects in stub rows.
+   *
+   * @var string
+   */
+  protected $stubCommentedEntityId;
+
+  /**
+   * The entity type used for 'commented entity' objects in stub rows.
+   *
+   * @var string
+   */
+  protected $stubCommentedEntityType;
+
+  /**
+   * The comment type used for 'comment_type' in stub rows.
+   *
+   * @var string
+   */
+  protected $stubCommentedCommentType;
+
+  /**
    * Builds an comment entity destination.
    *
    * @param array $configuration
@@ -87,4 +108,31 @@ public function import(Row $row, array $old_destination_id_values = array()) {
     return $return;
   }
 
+  protected function getEntity(Row $row, array $old_destination_id_values) {
+    if ($row->stub()) {
+      // Comment::postSave() requires $entity->getCommentedEntity() to be of
+      // type ContentEntityInterface; we can't leave it empty.
+      if (empty($this->stubCommentedEntityId)) {
+        // Since it's hard to derive the 'right' source values for this stub
+        // record in a migration agnostic way, and since the entity will be
+        // overwritten anyway... just try to pick a node.
+        $result = \Drupal::entityQueryAggregate('node')
+          ->aggregate('nid', 'MIN')
+          ->execute();
+        if ($result) {
+          $this->stubCommentedEntityId = $result[0]['nid_min'];
+          $this->stubCommentedEntityType = 'node';
+        }
+        // Add a stub comment_type.
+        $this->stubCommentedCommentType = 'comment';
+        // Figure out a working
+      }
+      if (!empty($this->stubCommentedEntityId)) {
+        $row->setDestinationProperty('entity_id', $this->stubCommentedEntityId);
+        $row->setDestinationProperty('entity_type', $this->stubCommentedEntityType);
+      }
+    }
+    return parent::getEntity($row, $old_destination_id_values);
+  }
+
 }
diff --git a/core/modules/migrate_drupal/src/Tests/d6/MigrateCommentTest.php b/core/modules/migrate_drupal/src/Tests/d6/MigrateCommentTest.php
index 77980cd..830beea 100644
--- a/core/modules/migrate_drupal/src/Tests/d6/MigrateCommentTest.php
+++ b/core/modules/migrate_drupal/src/Tests/d6/MigrateCommentTest.php
@@ -19,7 +19,7 @@
  */
 class MigrateCommentTest extends MigrateDrupalTestBase {
 
-  static $modules = array('node', 'comment');
+  static $modules = array('node', 'comment', 'rdf');
 
   /**
    * {@inheritdoc}
@@ -54,7 +54,12 @@ protected function setUp() {
       'd6_comment_entity_form_display' => array(array(array('story'), array('node', 'story', 'default', 'comment'))),
     );
     $this->prepareMigrations($id_mappings);
+  }
 
+  /**
+   * Tests the Drupal 6 to Drupal 8 comment migration.
+   */
+  public function testComments() {
     \Drupal::service('comment.manager')->addDefaultField('node', 'story');
     /** @var \Drupal\migrate\entity\Migration $migration */
     $migration = entity_load('migration', 'd6_comment');
@@ -67,12 +72,7 @@ protected function setUp() {
     $this->prepare($migration, $dumps);
     $executable = new MigrateExecutable($migration, $this);
     $executable->import();
-  }
 
-  /**
-   * Tests the Drupal 6 to Drupal 8 comment migration.
-   */
-  public function testComments() {
     /** @var \Drupal\comment\CommentInterface $comment */
     $comment = entity_load('comment', 1);
     $this->assertEqual('The first comment.', $comment->getSubject());