fixed exceptions or something