Handle incomplete responses correctly?