Don't assume the property exists in each message
Merge branch 'master' into multitenant