Fix unrecognised message handling