Error management improved