Ensured no translation error if there's no message
Fixed autocompletion code from merge