Added handling some error