Changes on warning and severe errors handling