added strict errors mapping