Handle empty body properly