MCOP-290 cope with no response

Needs tests