solve a bug in null value test. try to restore the codes in
client&server.