[#343347] clean up error messages for missing vars