diff --git a/py/ztools/lib/nutdb.py b/py/ztools/lib/nutdb.py
index b1b81f30..ae8c892d 100644
--- a/py/ztools/lib/nutdb.py
+++ b/py/ztools/lib/nutdb.py
@@ -581,7 +581,8 @@ def consolidate_versiondb():
 					tid=str(row[id]).upper() 
 					v_=str(row[ver])
 					if v_=="" and tid.endswith('800'):
-						v_=65536
+						continue
+						# v_=65536
 					elif v_=="":
 						v_=0					
 					if tid.endswith('800'):
@@ -600,7 +601,8 @@ def consolidate_versiondb():
 					tid=tid[:-3]+'000'
 				for j in (data[i]).keys():
 					if j=="" and i.endswith('800'):
-						j=65536
+						continue
+						# j=65536
 					elif j=="":
 						j=0							
 					try:
@@ -623,13 +625,16 @@ def consolidate_versiondb():
 					try:
 						j=entry['version']
 					except:
-						j=65536
+						continue
+						# j=65536
 				else:
 					try:
 						j=entry['version']
 					except:
 						j=0	
 				try:
+					if j is None:
+						continue
 					if not tid in ver_txt_dict:
 						ver_txt_dict[tid]=j
 					else:
@@ -649,7 +654,8 @@ def consolidate_versiondb():
 					try:
 						j=version
 					except:
-						j=65536
+						continue
+						# j=65536
 				else:
 					try:
 						j=version
@@ -674,7 +680,7 @@ def consolidate_versiondb():
 			if not updid in newdict:
 				newdict[i]='0'
 				newdict[updid]=v_	
-	ver_txt_dict=newdict		
+	ver_txt_dict=newdict
 	for i in data:
 		tid=i.upper()
 		if i.endswith('000'):