diff --git a/ChangeLog b/ChangeLog
index 9d0af88..3f3f4f7 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2011-08-13  Thomas Vander Stichele  <thomas at apestaart dot org>
+
+	* doc/release:
+	  Add note on actually running.
+	* morituri/common/program.py:
+	  Fix when running rip cd rip --unknown
+
 2011-08-07  Thomas Vander Stichele  <thomas at apestaart dot org>
 
 	* morituri/extern/task/task.py:
diff --git a/doc/release b/doc/release
index ec483b1..8ba3cc3 100644
--- a/doc/release
+++ b/doc/release
@@ -10,6 +10,9 @@ pre-release checklist
   rip -h
 - Verify that all buildbots are green:
   http://build.fluendo.com:8120/grid
+- Verify the program runs:
+  - normal run
+  - --unknown run
 - add new milestone to trac and make it the default
 - verify with ticket query that all fixed tickets for this milestone are
   correct:
diff --git a/morituri/common/program.py b/morituri/common/program.py
index e379502..7ca846f 100644
--- a/morituri/common/program.py
+++ b/morituri/common/program.py
@@ -410,7 +410,7 @@ class Program(log.Loggable):
 
         # gst-python 0.10.15.1 does not handle unicode -> utf8 string conversion
         # see http://bugzilla.gnome.org/show_bug.cgi?id=584445
-        if self.metadata.various:
+        if self.metadata and self.metadata.various:
             ret["album-artist"] = albumArtist.encode('utf-8')
         ret[gst.TAG_ARTIST] = trackArtist.encode('utf-8')
         ret[gst.TAG_TITLE] = title.encode('utf-8')