Get rid of the Exit testing since it calls System.exit()