diff --git a/filemgr/filemgr.py b/filemgr/filemgr.py
index 20dd3b5..aaaf087 100644
--- a/filemgr/filemgr.py
+++ b/filemgr/filemgr.py
@@ -47,7 +47,10 @@ class FileMgr:
 		recs = await sor.sqlExe(sql, {'orgid': orgid})
 		if len(recs) == 0:
 			return 0
-		return recs[0].quota_used / 1000000
+		r = recs[0]
+		if r.quota_used is None:
+			r.quota_used = 0
+		return r.quota_used / 1000000
 
 	async def add_file(self, request, params_kw):
 		fs = FileStorage()
@@ -126,12 +129,11 @@ class FileMgr:
 			raise e
 		delrecs = []
 		async for f in self.sor_get_subfile(sor, id):
-			recs = await self._del_file(sor, f.id, ownerid)
-			delrecs += recs
+			rec = await self._del_file(sor, f.id, ownerid)
+			delrecs.append(rec)
 		async for f in self.sor_get_subfolder(sor, id):
-			rec = await self._del_folder(sor, f.id, ownerid)
-			if rec:
-				delrecs.append(rec)
+			recs = await self._del_folder(sor, f.id, ownerid)
+			delrecs += recs
 		await sor.D('folder', {'id': id})
 		return delrecs