diff --git a/lib/lastfm/recenttracks-stream.js b/lib/lastfm/recenttracks-stream.js
index 132a2d1..061456f 100644
--- a/lib/lastfm/recenttracks-stream.js
+++ b/lib/lastfm/recenttracks-stream.js
@@ -1,111 +1,108 @@
 var LastFmBase = require("./lastfm-base");
 
 var RecentTracksStream = module.exports = function(lastfm, user, options) {
-  var that = this;
-  LastFmBase.call(this);
-  options = options || {};
-
-  var rate = 10
-    , isStreaming = false
-    , timeout
-    , lastPlay = null
-    , nowPlaying = null;
-
-  registerEventHandlers(options);
-
-  if (options.autostart) {
-    start();
-  }
-
-  this.start = function() {
-    start();
-  }
-
-  this.stop = function() {
-    stop();
-  }
-
-  this.isStreaming = function() {
-    return isStreaming;
-  }
-
-  function registerEventHandlers(options) {
-    that.registerHandlers(options.handlers);
-  }
-
-  function start() {
-    isStreaming = true;
-    check();
-
-    function check() {
-      var request = lastfm.request("user.getrecenttracks", {
-        user: user,
-        limit: 1
-      });
-      request.on("success", handleSuccess);
-      request.on("error", bubbleError);
-      if (isStreaming) {
-        timeout = that.scheduleCallback(check, rate * 1000);
-      }
+    var that = this;
+    LastFmBase.call(this);
+    options = options || {};
+
+    var rate = 10,
+        isStreaming = false,
+        timeout, lastPlay = {"name":""},
+        nowPlaying = {"name":""};
+
+    registerEventHandlers(options);
+
+    if (options.autostart) {
+        start();
+    }
+
+    this.start = function() {
+        start();
+    }
+
+    this.stop = function() {
+        stop();
     }
 
-    function handleSuccess(data) {
-      if (!data || !data.recenttracks || !data.recenttracks.track) {
-        that.emit("error", new Error("Unexpected response"));
-        return;
-      }
-
-      var tracks = data.recenttracks.track;
-      if (tracks instanceof Array) {
-        processNowPlaying(tracks[0]);
-        processLastPlay(tracks[1]);
-        return;
-      }
-
-      var track = tracks;
-      if (track["@attr"] && track["@attr"]["nowplaying"]) {
-        processNowPlaying(track);
-        return;
-      }
-    
-      processLastPlay(track);
-      if (nowPlaying) {
-        that.emit("stoppedPlaying", nowPlaying);
-        nowPlaying = null;
-      }
+    this.isStreaming = function() {
+        return isStreaming;
     }
 
-    function bubbleError(error) {
-      that.emit("error", error);
+    function registerEventHandlers(options) {
+        that.registerHandlers(options.handlers);
     }
-  }
 
-  function processNowPlaying(track) {
-    var sameTrack = (nowPlaying && nowPlaying.name == track.name);
-    if (!sameTrack) {
-      nowPlaying = track;
-      that.emit("nowPlaying", track);
+    function start() {
+        isStreaming = true;
+        check();
+
+        function check() {
+            var request = lastfm.request("user.getrecenttracks", {
+                user: user,
+                limit: 1
+            });
+            request.on("success", handleSuccess);
+            request.on("error", bubbleError);
+            if (isStreaming) {
+                timeout = that.scheduleCallback(check, rate * 1000);
+            }
+        }
+
+        function handleSuccess(data) {
+            if (!data || !data.recenttracks || !data.recenttracks.track) {
+                that.emit("error", new Error("Unexpected response"));
+                return;
+            }
+
+            var tracks = data.recenttracks.track;
+            if (tracks instanceof Array) {
+                processNowPlaying(tracks[0]);
+                processLastPlay(tracks[1]);
+                return;
+            }
+
+            var track = tracks;
+            if (track["@attr"] && track["@attr"]["nowplaying"]) {
+                processNowPlaying(track);
+                return;
+            }
+
+            processLastPlay(track);
+            if (nowPlaying) {
+                that.emit("stoppedPlaying", nowPlaying);
+                nowPlaying = {"name":""};
+            }
+        }
+
+        function bubbleError(error) {
+            that.emit("error", error);
+        }
     }
-  }
 
-  function processLastPlay(track) {
-    if (!lastPlay) {
-      lastPlay = track;
-      that.emit("lastPlayed", track);
-      return;
+    function processNowPlaying(track) {
+        that.emit("nowPlaying", track, user);
     }
 
-    var sameTrack = (lastPlay.name == track.name);
-    if (!sameTrack) {
-      lastPlay = track;
-      that.emit("scrobbled", track);
+    function processLastPlay(track) {
+        if (!lastPlay) {
+            lastPlay = track;
+            that.emit("lastPlayed", track);
+            return;
+        }
+        var sameTrack = false;
+        if (track && lastPlay) {
+            sameTrack = (lastPlay.name == track.name);
+        }
+        if (!sameTrack) {
+            lastPlay = track;
+            that.emit("scrobbled", track);
+        }
     }
-  }
 
-  function stop() {
-    that.cancelCallback(timeout);
-    isStreaming = false;
-  }
+    function stop() {
+        that.cancelCallback(timeout);
+        isStreaming = false;
+    }
 };
 
 RecentTracksStream.prototype = Object.create(LastFmBase.prototype);