Tweak stream()

To catch errors etc.