better errors added