update

crash fix and exit fix