diff --git a/class2.php b/class2.php
index f67dd274e..59257b217 100755
--- a/class2.php
+++ b/class2.php
@@ -961,13 +961,10 @@ if (!class_exists('e107table', false))
 		{
 			$ret = array();
 
-		//	$ret['{---CAPTION1---}'] = varset($this->renders[0]['caption']);
-		//	$ret['{---CAPTION2---}'] = varset($this->renders[1]['caption']);
 
 			$types = array('caption') + $this->contentTypes;
 
 
-
 			$c = 1;
 
 			foreach($this->renders as $k => $val)
@@ -976,7 +973,7 @@ if (!class_exists('e107table', false))
 				foreach($types as $var)
 				{
 					$sc = '{---'.strtoupper($var).$c.'---}';
-					$ret[$sc] = $val[$var];
+					$ret[$sc] = varset($val[$var]);
 				}
 
 				$c++;
diff --git a/e107_plugins/download/download_shortcodes.php b/e107_plugins/download/download_shortcodes.php
index 92fd3e536..15d21c02b 100644
--- a/e107_plugins/download/download_shortcodes.php
+++ b/e107_plugins/download/download_shortcodes.php
@@ -69,7 +69,7 @@ class download_shortcodes extends e_shortcode
 				}
 
 				$breadcrumb[]	= array('text' => $this->var['download_category_name'],	'url' => ($this->var['download_category_id']) ?  e107::url('download', 'category', $this->var) : null);
-				$breadcrumb[]	= array('text' => $this->var['download_name'],			'url' => null);
+				$breadcrumb[]	= array('text' => varset($this->var['download_name']),			'url' => null);
 			break;
 		}