diff --git a/slideshow_creator.inc b/slideshow_creator.inc
index 2f144a7..ca08cd2 100644
--- a/slideshow_creator.inc
+++ b/slideshow_creator.inc
@@ -749,12 +749,15 @@ function _theme_slideshow_creator_content($ssid, &$ssc, &$ss) {
     $main = $ss['#main'];
   }
 
-  $ssc['#content'][] = array(
-    '#title'   => "<span class='ssc-title'>$title</span>\n",
-    '#caption' => '<span class="ssc-caption ssc-description">' .
-                  $ss['#caption'] . "</span>\n",
-    '#main'    => "<span class='ssc-main'>$main</span>\n",
-  );
+  $ssc_item = array();
+  if ( $title != '') {
+    $ssc_item['#title'] = "<span class='ssc-title'>$title</span>\n";
+  }
+  if ( $caption != '') {
+    $ssc_item['#caption'] = "<span class='ssc-caption ssc-description'>$caption</span>";
+  }
+  $ssc_item['#main'] = "<span class='ssc-main'>$main</span>\n";
+  $ssc['#content'][] = $ssc_item;
 }
 
 /**
