Remove couple of re-raise to avoid confusion