Ticket #205 - proper handling of quit/stop/exit