Attach node to ImportError
Remove TODO