added some catch