Index: eclipse/SVN/Plugins/ShoutcastBrowser/Plugin.pm
===================================================================
--- eclipse/SVN/Plugins/ShoutcastBrowser/Plugin.pm	(revision 3706)
+++ eclipse/SVN/Plugins/ShoutcastBrowser/Plugin.pm	(working copy)
@@ -364,6 +364,9 @@
 		return 0;
 	}
 	else {
+		if (ref $data->{'playlist'}->{'entry'} ne 'ARRAY') {
+			$data->{'playlist'}->{'entry'} = [ $data->{'playlist'}->{'entry'} ];
+		}
 		return $data;
 	}
 }
@@ -511,7 +514,10 @@
 	}
 	$genres_data{top} = [ sort { $topHelper{$b} <=> $topHelper{$a} } keys %topHelper ];
 
-	splice @{$genres_data{top}}, Slim::Utils::Prefs::get('plugin_shoutcastbrowser_max_popular');
+	if (Slim::Utils::Prefs::get('plugin_shoutcastbrowser_max_popular') < $#{$genres_data{top}}) {
+		splice @{$genres_data{top}}, Slim::Utils::Prefs::get('plugin_shoutcastbrowser_max_popular');
+	}
+
 	$stream_data{getMostPopularName($client)} = $stream_data{$allName};
 }