Fix bug on null response