Fix issue with empty responses