Handle non-wrapped messages from v5. Fixes #371