Temporary fix for the case when server resposne has no content