Added handling for busy database which was causing general failures