Added exception catach