Added exception rescueing