Adding a case for invalid json in migration.
Merge branch 'master' into messagemenu