diff --git a/plugins/org.jkiss.dbeaver.model/src/org/jkiss/dbeaver/model/data/DBDAttributeBindingNested.java b/plugins/org.jkiss.dbeaver.model/src/org/jkiss/dbeaver/model/data/DBDAttributeBindingNested.java
index f7d15be9111b07de9d75573a8725b5c218417b3f..7ce9e7a4a56c11f6c81fa1fad0bbcc58860967e7 100644
--- a/plugins/org.jkiss.dbeaver.model/src/org/jkiss/dbeaver/model/data/DBDAttributeBindingNested.java
+++ b/plugins/org.jkiss.dbeaver.model/src/org/jkiss/dbeaver/model/data/DBDAttributeBindingNested.java
@@ -46,7 +46,7 @@ public abstract class DBDAttributeBindingNested extends DBDAttributeBinding impl
         return parent.getDataSource();
     }
 
-    @Nullable
+    @NotNull
     public DBDAttributeBinding getParentObject() {
         return parent;
     }
@@ -61,14 +61,12 @@ public abstract class DBDAttributeBindingNested extends DBDAttributeBinding impl
 
     @Override
     public boolean isReadOnly() {
-        assert parent != null;
         return parent.getMetaAttribute().isReadOnly();
     }
 
     @Nullable
     @Override
     public DBCEntityMetaData getEntityMetaData() {
-        assert parent != null;
         return parent.getMetaAttribute().getEntityMetaData();
     }
 
@@ -77,7 +75,6 @@ public abstract class DBDAttributeBindingNested extends DBDAttributeBinding impl
      */
     @Nullable
     public DBDRowIdentifier getRowIdentifier() {
-        assert parent != null;
         return parent.getRowIdentifier();
     }
 
diff --git a/plugins/org.jkiss.dbeaver.ui.editors.data/src/org/jkiss/dbeaver/ui/controls/resultset/ResultSetModel.java b/plugins/org.jkiss.dbeaver.ui.editors.data/src/org/jkiss/dbeaver/ui/controls/resultset/ResultSetModel.java
index be5838b08cce91d6faa6c6064985f080e4d0dc9d..03397b26fa9ecc2fbf33f6c351370b2d999c9622 100644
--- a/plugins/org.jkiss.dbeaver.ui.editors.data/src/org/jkiss/dbeaver/ui/controls/resultset/ResultSetModel.java
+++ b/plugins/org.jkiss.dbeaver.ui.editors.data/src/org/jkiss/dbeaver/ui/controls/resultset/ResultSetModel.java
@@ -389,6 +389,9 @@ public class ResultSetModel {
                                 log.warn("Attribute '" + ownerAttr.getName() + "' has collection type but attribute value is not a collection: " + nestedValue);
                             }
                         }
+                        if (ownerValue instanceof DBDComposite) {
+                            ((DBDComposite) ownerValue).setAttributeValue(ownerAttr, nestedValue);
+                        }
                     }
                     ownerValue = nestedValue;
                 } catch (DBCException e) {