#1640: Handle bad nodes.
#1640: Tweak commit message.
Merge pull request #4001 from openscholar/1640-exception_catch

Exception handling for file_usage update