Better handling of missing message keys