Remove System.exit from Client.scala