@@ -543,8 +543,9 @@ inline PyObject *parse_class(PyObject *kwargs, TypeTreeNodeObject *node, TypeTre
         pos = 0;
         while (PyDict_Next(extras, &pos, &key, &value))
         {
-            PyObject_SetItem(instance, key, value);
+            PyObject_GenericSetAttr(instance, key, value);
         }
+        goto PARSE_CLASS_CLEANUP;
     }
     PyErr_Clear();
 
@@ -556,7 +557,7 @@ inline PyObject *parse_class(PyObject *kwargs, TypeTreeNodeObject *node, TypeTre
     pos = 0;
     while (PyDict_Next(extras, &pos, &key, &value))
     {
-        PyObject_SetItem(kwargs, key, value);
+        PyDict_SetItem(kwargs, key, value);
     }
     instance = PyObject_Call(clz, args, kwargs);
 
@@ -778,14 +779,14 @@ PyObject *read_typetree_value(ReaderT *reader, TypeTreeNodeObject *node, TypeTre
         }
         if (!config->as_dict)
         {
-            PyObject *clz = PyObject_GetAttrString(config->classes, "Object");
+            PyObject *clz = PyObject_GetAttrString(config->classes, "UnknownObject");
             if (clz == NULL)
             {
                 PyErr_SetString(PyExc_ValueError, "Failed to get class");
                 Py_DECREF(value);
                 return NULL;
             }
-            PyObject *args = PyTuple_New(0);
+            PyObject *args = PyTuple_Pack(1, (PyObject *)node);
             PyObject *instance = PyObject_Call(clz, args, value);
             Py_DECREF(clz);
             Py_DECREF(args);
@@ -943,7 +944,7 @@ PyObject *read_typetree(PyObject *self, PyObject *args, PyObject *kwargs)
     char endian;
     bool swap;
 
-    int parse_result = PyArg_ParseTupleAndKeywords(args, kwargs, "y*OC|pOO", (char **)kwlist, &view, &node, &endian, &as_dict, &config.assetfile, &config.classes);
+    if (!PyArg_ParseTupleAndKeywords(args, kwargs, "y*OC|pOO", (char **)kwlist, &view, &node, &endian, &as_dict, &config.assetfile, &config.classes))
     {
         goto READ_TYPETREE_CLEANUP;
     }
@@ -1018,7 +1019,6 @@ PyObject *read_typetree(PyObject *self, PyObject *args, PyObject *kwargs)
     PyBuffer_Release(&view);
     Py_DECREF(config.assetfile);
     Py_DECREF(config.classes);
-
     return value;
 }
Original file line number	Diff line number	Diff line change
`@@ -543,8 +543,9 @@ inline PyObject parse_class(PyObject kwargs, TypeTreeNodeObject *node, TypeTre`
`543`	`543`	`pos = 0;`
`544`	`544`	`while (PyDict_Next(extras, &pos, &key, &value))`
`545`	`545`	`{`
`546`		`- PyObject_SetItem(instance, key, value);`
	`546`	`+ PyObject_GenericSetAttr(instance, key, value);`
`547`	`547`	`}`
	`548`	`+ goto PARSE_CLASS_CLEANUP;`
`548`	`549`	`}`
`549`	`550`	`PyErr_Clear();`
`550`	`551`
`@@ -556,7 +557,7 @@ inline PyObject parse_class(PyObject kwargs, TypeTreeNodeObject *node, TypeTre`
`556`	`557`	`pos = 0;`
`557`	`558`	`while (PyDict_Next(extras, &pos, &key, &value))`
`558`	`559`	`{`
`559`		`- PyObject_SetItem(kwargs, key, value);`
	`560`	`+ PyDict_SetItem(kwargs, key, value);`
`560`	`561`	`}`
`561`	`562`	`instance = PyObject_Call(clz, args, kwargs);`
`562`	`563`
`@@ -778,14 +779,14 @@ PyObject read_typetree_value(ReaderT reader, TypeTreeNodeObject *node, TypeTre`
`778`	`779`	`}`
`779`	`780`	`if (!config->as_dict)`
`780`	`781`	`{`
`781`		`- PyObject *clz = PyObject_GetAttrString(config->classes, "Object");`
	`782`	`+ PyObject *clz = PyObject_GetAttrString(config->classes, "UnknownObject");`
`782`	`783`	`if (clz == NULL)`
`783`	`784`	`{`
`784`	`785`	`PyErr_SetString(PyExc_ValueError, "Failed to get class");`
`785`	`786`	`Py_DECREF(value);`
`786`	`787`	`return NULL;`
`787`	`788`	`}`
`788`		`- PyObject *args = PyTuple_New(0);`
	`789`	`+ PyObject args = PyTuple_Pack(1, (PyObject )node);`
`789`	`790`	`PyObject *instance = PyObject_Call(clz, args, value);`
`790`	`791`	`Py_DECREF(clz);`
`791`	`792`	`Py_DECREF(args);`
`@@ -943,7 +944,7 @@ PyObject read_typetree(PyObject self, PyObject args, PyObject kwargs)`
`943`	`944`	`char endian;`
`944`	`945`	`bool swap;`
`945`	`946`
`946`		`- int parse_result = PyArg_ParseTupleAndKeywords(args, kwargs, "yOC\|pOO", (char *)kwlist, &view, &node, &endian, &as_dict, &config.assetfile, &config.classes);`
	`947`	`+ if (!PyArg_ParseTupleAndKeywords(args, kwargs, "yOC\|pOO", (char *)kwlist, &view, &node, &endian, &as_dict, &config.assetfile, &config.classes))`
`947`	`948`	`{`
`948`	`949`	`goto READ_TYPETREE_CLEANUP;`
`949`	`950`	`}`
`@@ -1018,7 +1019,6 @@ PyObject read_typetree(PyObject self, PyObject args, PyObject kwargs)`
`1018`	`1019`	`PyBuffer_Release(&view);`
`1019`	`1020`	`Py_DECREF(config.assetfile);`
`1020`	`1021`	`Py_DECREF(config.classes);`
`1021`		`-`
`1022`	`1022`	`return value;`
`1023`	`1023`	`}`
`1024`	`1024`