Fixed DataTool NPE
Fixed CheckUpdateThread NPE
Minor changes