Fix bug with null response