FIX #1963: catch Ctrl-C and clean up properly