clearer fix for double free bug

Closes #340
simplify a disabled AddIDsStream

If the AddIDsStream is disabled we don't have to do anything here.
Merge pull request #425 from gordon/doublefree

Doublefree