Guard against a rare (put possible) IndexError
Merge pull request #517 from seandst/nodeid-indexerror

Guard against a rare (put possible) IndexError