Fixed scala Null/Unit issue with Streamer class