diff --git a/src/Core/Banshee.Widgets/Banshee.Widgets/DictionaryComboBox.cs b/src/Core/Banshee.Widgets/Banshee.Widgets/DictionaryComboBox.cs
index faa5052..3d3db25 100644
--- a/src/Core/Banshee.Widgets/Banshee.Widgets/DictionaryComboBox.cs
+++ b/src/Core/Banshee.Widgets/Banshee.Widgets/DictionaryComboBox.cs
@@ -122,7 +122,14 @@ namespace Banshee.Widgets
 
                 return default (T);
             }
-            set { SetActiveIter (IterFor (value)); }
+            set {
+                var iter = IterFor (value);
+                if (TreeIter.Zero.Equals (iter)) {
+                    Hyena.Log.WarningFormat ("Cannot set ActiveValue to {0}, it's TreeIter is null", value);
+                } else {
+                    SetActiveIter (iter);
+                }
+            }
         }
     }
 }
diff --git a/src/Extensions/Banshee.PlayQueue/Banshee.PlayQueue/HeaderWidget.cs b/src/Extensions/Banshee.PlayQueue/Banshee.PlayQueue/HeaderWidget.cs
index adba02d..0899110 100644
--- a/src/Extensions/Banshee.PlayQueue/Banshee.PlayQueue/HeaderWidget.cs
+++ b/src/Extensions/Banshee.PlayQueue/Banshee.PlayQueue/HeaderWidget.cs
@@ -58,6 +58,7 @@ namespace Banshee.PlayQueue
             var fill_label = new Label (Catalog.GetString ("_Fill"));
             mode_combo = new DictionaryComboBox<RandomBy> ();
             foreach (var random_by in shuffler.RandomModes.OrderBy (r => r.Adverb)) {
+                Console.WriteLine ("PlayQueue.HeaderWidget.ctor have random by {0}", random_by.Id);
                 mode_combo.Add (random_by.Adverb, random_by);
                 if (random_by.Id == "off") {
                     mode_combo.Default = random_by;
@@ -97,10 +98,12 @@ namespace Banshee.PlayQueue
             PackStart (source_combo_box, false, false, 0);
 
             // Select the saved population mode.
+            Console.WriteLine ("shuffle_mode_id = {0}", shuffle_mode_id);
             var default_randomby = shuffler.RandomModes.FirstOrDefault (r => r.Id == shuffle_mode_id);
+            Console.WriteLine ("default_randomby is null? {0} (is {1})", default_randomby == null, default_randomby);
             if (default_randomby != null) {
                 mode_combo.ActiveValue = default_randomby;
-            } else {
+            } else if (mode_combo.Default != null) {
                 mode_combo.ActiveValue = mode_combo.Default;
             }
 
