diff --git a/themes/marvin/marvin.theme b/themes/marvin/marvin.theme
index 91f0a6b6d26..404e692d329 100644
--- a/themes/marvin/marvin.theme
+++ b/themes/marvin/marvin.theme
@@ -22,8 +22,8 @@ function marvin_header() {
   $output .= theme_head($main);
   $output .= "<title>";
 
-  if (drupal_get_title()) {
-    $output .= drupal_get_title() ." - ". variable_get("site_name", "drupal");
+  if ($title = drupal_get_title()) {
+    $output .= "$title - ". variable_get("site_name", "drupal");
   }
   else {
     $output .= variable_get("site_name", "drupal");
@@ -56,8 +56,11 @@ function marvin_header() {
   }
   $output .= "    <td style=\"vertical-align: top; width: 85%;\">\n";
 
-  $output .= theme("breadcrumb", drupal_get_breadcrumb());
-  $output .= "<h2>" . drupal_get_title() . "</h2>";
+  if ($title = drupal_get_title()) {
+    $output .= theme("breadcrumb", drupal_get_breadcrumb());
+    $output .= "<h2>$title</h2>";
+  }
+
   if ($help = menu_get_active_help()) {
     $output .= "<small>$help</small><hr />";
   }