Added rescue from the errors