diff --git a/nixtape/data/Group.php b/nixtape/data/Group.php
index 5b07198b3479b06dca64d99809bb1ddff9b68e65..5eefce5f3a8bd7d344193de5e6695c5385d15206 100644
--- a/nixtape/data/Group.php
+++ b/nixtape/data/Group.php
@@ -379,12 +379,16 @@ class Group {
 	}
 
 	function tagCloudData () {
-		return TagCloud::generateTagCloud(
-				TagCloud::scrobblesTable('group').' s LEFT JOIN Users u ON s.userid=u.uniqueid LEFT JOIN Group_Members gm ON u.uniqueid=gm.member LEFT JOIN Groups g ON gm.grp=g.id',
-				'artist',
-				40,
-				$this->name,
-				'groupname');
+		try {
+			return TagCloud::generateTagCloud(
+					TagCloud::scrobblesTable('group').' s LEFT JOIN Users u ON s.userid=u.uniqueid LEFT JOIN Group_Members gm ON u.uniqueid=gm.member LEFT JOIN Groups g ON gm.grp=g.id',
+					'artist',
+					40,
+					$this->name,
+					'groupname');
+		} catch (Exception $e) {
+			return false;
+		}
 	}
 
 }
diff --git a/nixtape/popular.php b/nixtape/popular.php
index 548134f23029ee5ba2701331d9acaf8b7d130c29..f64e387ae8ad7c2c6801cb0e2a1142e194097b89 100644
--- a/nixtape/popular.php
+++ b/nixtape/popular.php
@@ -25,9 +25,9 @@ require_once('data/sanitize.php');
 require_once('data/Server.php');
 require_once('data/TagCloud.php');
 
-$aTagCloud = TagCloud::GenerateTagCloud('loved_tracks', 'artist');
-if ($aTagCloud) {
+try {
+	$aTagCloud = TagCloud::GenerateTagCloud('loved_tracks', 'artist');
 	$smarty->assign('tagcloud', $aTagCloud);
-}
+} catch (Exception $e) {}
 
 $smarty->display("popular.tpl");