Changed exit() to return statements as per Lint4J suggestions