diff --git a/src/nut/config/nut_macros.h b/src/nut/config/nut_macros.h
index 260a786..c4e08ae 100644
--- a/src/nut/config/nut_macros.h
+++ b/src/nut/config/nut_macros.h
@@ -98,7 +98,7 @@ public : \
         m_##name##Id = name->primaryValue().value<keytype>();                  \
     }                                                                          \
     void class::write(Nut::Row<Nut::Table> name){                              \
-        write(qSharedPointerObjectCast<type>(name));                           \
+        write(qSharedPointerDynamicCast<type>(name));                          \
     } keytype class::read##Id() const{                                         \
         if (m_##name)                                                          \
             return m_##name->primaryValue().value<keytype>();                  \
diff --git a/src/nut/core/query.h b/src/nut/core/query.h
index bd74d31..d73a20f 100644
--- a/src/nut/core/query.h
+++ b/src/nut/core/query.h
@@ -384,7 +384,8 @@ Q_OUTOFLINE_TEMPLATE RowList<T> Query<T>::toList(int count)
                 int master = data.masters[i];
                 auto tableset = levels[master].lastRow.data()->childTableSet(
                             data.table->className());
-                tableset->add(row);
+                if (tableset)
+                    tableset->add(row);
 
                 //set key
                 {
@@ -398,7 +399,6 @@ Q_OUTOFLINE_TEMPLATE RowList<T> Query<T>::toList(int count)
                                                               Q_ARG(Nut::Row<Nut::Table>,
                                                                     levels[master].lastRow));
 
-                    qDebug() << "data.masterFields[master]=" << setterName << ok;
                 }
             }