Recovery commit
merged the try/catch code with latest