Prevent attrs/facts being added for non-existant nodes.
Preventing facts with non-existant nodes breaks stuff. Changed to only attrs
Merge pull request #429 from git-harry/sprint

Merged automatically by jenkins after successful gate test