Make sure the shape.node object exists

Sorry -- meant to mention that this addresses #1648 .