fixed null exception on check 6.