fixing issues when Response is empty