Adapt to existing code style
Use return instead of exit