diff --git a/helpers.py b/helpers.py
index bc7f454..f3d3c05 100644
--- a/helpers.py
+++ b/helpers.py
@@ -607,8 +607,8 @@ def dump(key):
         data = dump_datablock_attibute(target,["name",'size','height','alpha','float_buffer','filepath','source'], 2, data)
     elif target_type == 'Material':
         data = dump_datablock(target, 2)
-        dump_datablock_attibute(target.node_tree, ["nodes","links"] , 3, data['node_tree'])
-        logger.debug("Material {} dumped".format(key))
+        if target.node_tree:
+            dump_datablock_attibute(target.node_tree, ["nodes","links"] , 3, data['node_tree'])
     elif target_type == 'GreasePencil':
         data = dump_datablock(target, 2)
         dump_datablock_attibute(
diff --git a/operators.py b/operators.py
index 2d87edd..524a9e8 100644
--- a/operators.py
+++ b/operators.py
@@ -87,8 +87,6 @@ def update_client_selected_object(context):
         client_data[0][1]['active_objects'] = []
         client.instance.set(client_key, client_data[0][1])
 
-# TODO: cleanup
-
 
 def init_datablocks():
     for datatype in environment.rtypes:
@@ -471,7 +469,6 @@ def toogle_update_dirty(context, update):
     data_ref = get_datablock_from_update(update, context)
 
     if data_ref:
-        logger.debug(update.id.bl_rna.__class__.__name__)
         data_ref.is_dirty = True