Exit more cleanly