diff --git a/core/model/DataObject.php b/core/model/DataObject.php
index ea889769c..699319a4f 100644
--- a/core/model/DataObject.php
+++ b/core/model/DataObject.php
@@ -2461,7 +2461,8 @@ class DataObject extends ViewableData implements DataObjectInterface, i18nEntity
 						}
 					}
 					if($compositeFields) foreach($compositeFields as $k => $v) {
-						$this->dbObject($k)->addToQuery($query);
+						$dbO = $this->dbObject($k);
+						if($dbO) $dbO->addToQuery($query);
 					}
 				}
 			}