Make sure the shape.node object exists
Merge pull request #1649 from Protuhj/issue_1648

Make sure the shape.node object exists