diff --git a/docs/changes.rst b/docs/changes.rst
index 7bf1ebba..4a8548bf 100644
--- a/docs/changes.rst
+++ b/docs/changes.rst
@@ -81,6 +81,19 @@ No description yet.
     :class:`mopidy.outputs.base.BaseOutput`.
 
 
+0.2.1 (2011-01-07)
+==================
+
+This is a maintenance release without any new features.
+
+**Bugfixes**
+
+- Fix crash in :mod:`mopidy.frontends.lastfm` which occurred at playback if
+  either :mod:`pylast` was not installed or the Last.fm scrobbling was not
+  correctly configured. The scrobbling thread now shuts properly down at
+  failure.
+
+
 0.2.0 (2010-10-24)
 ==================
 
diff --git a/docs/development/contributing.rst b/docs/development/contributing.rst
index 4adde637..a9cd8dc3 100644
--- a/docs/development/contributing.rst
+++ b/docs/development/contributing.rst
@@ -137,7 +137,7 @@ Then, to generate docs::
 .. note::
 
     The documentation at http://www.mopidy.com/ is automatically updated when a
-    documentation update is pushed to ``jodal/mopidy`` at GitHub.
+    documentation update is pushed to ``mopidy/mopidy`` at GitHub.
 
     Documentation generated from the ``master`` branch is published at
     http://www.mopidy.com/docs/master/, and will always be valid for the latest
diff --git a/mopidy/frontends/lastfm.py b/mopidy/frontends/lastfm.py
index 0cf534af..ddd621f8 100644
--- a/mopidy/frontends/lastfm.py
+++ b/mopidy/frontends/lastfm.py
@@ -54,7 +54,8 @@ class LastfmFrontend(BaseFrontend):
         self.thread.destroy()
 
     def process_message(self, message):
-        self.connection.send(message)
+        if self.thread.is_alive():
+            self.connection.send(message)
 
 
 class LastfmFrontendThread(BaseThread):
@@ -68,7 +69,7 @@ class LastfmFrontendThread(BaseThread):
 
     def run_inside_try(self):
         self.setup()
-        while True:
+        while self.scrobbler is not None:
             self.connection.poll(None)
             message = self.connection.recv()
             self.process_message(message)