Adding a logic to deal with case where body comes through but not in response