diff --git a/Database/ObjectCollection.php b/Database/ObjectCollection.php
index <HASH>..<HASH> 100644
--- a/Database/ObjectCollection.php
+++ b/Database/ObjectCollection.php
@@ -265,11 +265,11 @@ abstract class ObjectCollection extends DynamicCollection implements IDynamicCol
      */
     protected function rebuildQueryForCustomLoad($query)
     {
-        if ($this->where !== null) {
-            if ($this->getFieldsAndTypes() === false) {
-                return false;
-            }
+        if ($this->getFieldsAndTypes() === false) {
+            return false;
+        }
 
+        if ($this->where !== null) {
             $where = $this->where;
             if (count($where) !== 1) {
                 return false;
fix not loaded Model properties through many-to-many