Fixed ErrorException changes