Remove throwing exceptions