From c3411093d9a36e7fe2ffebd16a195a417ff98eff Mon Sep 17 00:00:00 2001
From: Jose Lorenzo Rodriguez <jose.zap@gmail.com>
Date: Mon, 3 Mar 2014 11:04:23 +0100
Subject: [PATCH] More defensive coding

---
 src/ORM/Marshaller.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/ORM/Marshaller.php b/src/ORM/Marshaller.php
index 26dc94ce601..d3914ab6a41 100644
--- a/src/ORM/Marshaller.php
+++ b/src/ORM/Marshaller.php
@@ -355,7 +355,7 @@ protected function _mergeBelongsToMany($original, $assoc, $data, $include) {
 		$extra = [];
 		foreach ($original as $entity) {
 			$joinData = $entity->get('_joinData');
-			if ($joinData) {
+			if ($joinData && $joinData instanceof EntityInterface) {
 				$extra[spl_object_hash($entity)] = $joinData;
 			}
 		}