proper control of errors added
proper control of errors added