Drop unserializable messages and preserve association. Fixes #2830