fix null exception