Added correct exit back for non-server mode