Should add an exit point if no is given