1. Improve error message
  2. Other things