Changed control flow to be non-breaking