Add raise statements back