Implemented recovery after repairing broken SFDC. #71