Fix null response bug