Fix issue with empty body response
Fix issue with empty body response