fixes around empty responses