Remove some bug, add try statement