Changing error handling implementation once more