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

Change-Id: I2feb75c1a178df0eeffe8e234072eafa3628bd6a
Signed-off-by: Dana Kutenicsova <dkutenic@cisco.com>
Merge "BUG-2448 : added more defensive lookup to node & link attributes"