Added exception handling
update
merge