diff --git a/omega/template.php b/omega/template.php
index 0e81d72..e6bc532 100644
--- a/omega/template.php
+++ b/omega/template.php
@@ -209,7 +209,7 @@ function omega_alpha_preprocess_block(&$vars) {
   // Add odd/even zebra classes into the array of classes
   $vars['attributes_array']['class'][] = $vars['block_zebra'];
 
-  if(empty($vars['block']->subject) && (string) $vars['block']->subject != '0') {
+  if (!isset($vars['block']->subject) || (empty($vars['block']->subject) && $vars['block']->subject !== '0')) {
     // Add a class to provide CSS for blocks without titles.
     $vars['attributes_array']['class'][] = 'block-without-title';
   }
diff --git a/omega/templates/block.tpl.php b/omega/templates/block.tpl.php
index f357261..fae763a 100644
--- a/omega/templates/block.tpl.php
+++ b/omega/templates/block.tpl.php
@@ -1,8 +1,8 @@
-<?php $tag = $block->subject ? 'section' : 'div'; ?>
+<?php $tag = !empty($block->subject) ? 'section' : 'div'; ?>
 <<?php print $tag; ?><?php print $attributes; ?>>
   <div class="block-inner clearfix">
     <?php print render($title_prefix); ?>
-    <?php if ($block->subject): ?>
+    <?php if (!empty($block->subject)): ?>
       <h2<?php print $title_attributes; ?>><?php print $block->subject; ?></h2>
     <?php endif; ?>
     <?php print render($title_suffix); ?>