kevin
fix hanler nullpointer