Add rescue block to get rid of 'octet' messages once and for all