Improved error messages in Keywords.