Stream doesn't handle nulls : fixes #19