fixed null response error