Added an option to disable update checking; Fixed a potential NPE bug.