Added guards around changes to stream modifiers.
Merge branch 'issue-62' into develop