filter out an unnecessary error, and improve some messages #689