ErrorHanler improvements