Check and better errors