Changed error messages propragation