Added more except catching