fix null response bug