fix NPE and have unsubscribe(Stream) return something useful