diff --git a/Fwk/AppFwk/cafProjectDataModel/cafPdmUiCore/cafPdmUiTreeOrdering.cpp b/Fwk/AppFwk/cafProjectDataModel/cafPdmUiCore/cafPdmUiTreeOrdering.cpp
index a14d686c6a..798e1a1f8b 100644
--- a/Fwk/AppFwk/cafProjectDataModel/cafPdmUiCore/cafPdmUiTreeOrdering.cpp
+++ b/Fwk/AppFwk/cafProjectDataModel/cafPdmUiCore/cafPdmUiTreeOrdering.cpp
@@ -105,7 +105,7 @@ bool PdmUiTreeOrdering::containsObject(const PdmObjectHandle* object)
     {
         PdmUiTreeOrdering* child = dynamic_cast<PdmUiTreeOrdering*>(this->child(cIdx)); // What again ???
 
-        if (child->object() == object)
+        if (child->isRepresentingObject() && child->object() == object)
         {
             return true;
         }
diff --git a/Fwk/AppFwk/cafUserInterface/cafPdmUiTreeViewModel.cpp b/Fwk/AppFwk/cafUserInterface/cafPdmUiTreeViewModel.cpp
index fd2a02573f..216da5c952 100644
--- a/Fwk/AppFwk/cafUserInterface/cafPdmUiTreeViewModel.cpp
+++ b/Fwk/AppFwk/cafUserInterface/cafPdmUiTreeViewModel.cpp
@@ -483,7 +483,8 @@ QVariant PdmUiTreeViewModel::data(const QModelIndex &index, int role ) const
     bool isFieldRep = uitreeOrdering->isRepresentingField();
     bool isDisplayOnly = uitreeOrdering->isDisplayItemOnly();
 
-    assert (uitreeOrdering->isValid()); // Tree generation has some error.
+	// MODTODO
+    //assert (uitreeOrdering->isValid()); // Tree generation has some error.
 
     if (role == Qt::DisplayRole || role == Qt::EditRole)
     {