STREAMS-157 | Modified the way that IDs are set so that we are more tole...

...rant to null values, which can be necessary