Merge "BUG-2448 : added more defensive lookup to node & link attributes"