Add should_raise flag
Make should_raise work