diff --git a/airtime_mvc/application/models/Block.php b/airtime_mvc/application/models/Block.php
index ae05316bc..24c4f46f5 100644
--- a/airtime_mvc/application/models/Block.php
+++ b/airtime_mvc/application/models/Block.php
@@ -903,11 +903,11 @@ class Application_Model_Block
     
         foreach ($data['criteria'] as $key=>$d){
             $error = array();
-            $column = CcFilesPeer::getTableMap()->getColumnByPhpName(self::$criteria2PeerMap[$d['sp_criteria_field']]);
             // check for not selected select box
             if ($d['sp_criteria_field'] == "0" || $d['sp_criteria_modifier'] == "0"){
                 $error[] =  "You must select Criteria and Modifier";
-            } else {
+            } else {
+                $column = CcFilesPeer::getTableMap()->getColumnByPhpName(self::$criteria2PeerMap[$d['sp_criteria_field']]);
                 // validation on type of column
                 if ($d['sp_criteria_field'] == 'length') {
                     if (!preg_match("/(\d{2}):(\d{2}):(\d{2})/", $d['sp_criteria_value'])) {
diff --git a/airtime_mvc/application/models/airtime/CcBlock.php b/airtime_mvc/application/models/airtime/CcBlock.php
index fb519bbd3..da43e76f0 100644
--- a/airtime_mvc/application/models/airtime/CcBlock.php
+++ b/airtime_mvc/application/models/airtime/CcBlock.php
@@ -78,7 +78,7 @@ class CcBlock extends BaseCcBlock {
 
     /**
      * Computes the value of the aggregate column length
-     * Overridden to provide a default of 00:00:00 if the playlist is empty.
+     * Overridden to provide a default of 00:00:00 if the block is empty.
      *
      * @param PropelPDO $con A connection object
      *
@@ -86,7 +86,7 @@ class CcBlock extends BaseCcBlock {
      */
     public function computeDbLength(PropelPDO $con)
     {
-        $stmt = $con->prepare('SELECT SUM(cliplength) FROM "cc_playlistcontents" WHERE cc_playlistcontents.PLAYLIST_ID = :p1');
+        $stmt = $con->prepare('SELECT SUM(cliplength) FROM "cc_blockcontents" WHERE cc_blockcontents.BLOCK_ID = :p1');
         $stmt->bindValue(':p1', $this->getDbId());
         $stmt->execute();
         $length = $stmt->fetchColumn();
diff --git a/airtime_mvc/application/models/airtime/CcBlockcontents.php b/airtime_mvc/application/models/airtime/CcBlockcontents.php
index 0837acd72..f6de2dd45 100644
--- a/airtime_mvc/application/models/airtime/CcBlockcontents.php
+++ b/airtime_mvc/application/models/airtime/CcBlockcontents.php
@@ -40,7 +40,7 @@ class CcBlockcontents extends BaseCcBlockcontents {
      *
      * @param String in format SS.uuuuuu, Datetime, or DateTime accepted string.
      *
-     * @return CcPlaylistcontents The current object (for fluent API support)
+     * @return CcBlockcontents The current object (for fluent API support)
      */
     public function setDbFadein($v)
     {
@@ -59,7 +59,7 @@ class CcBlockcontents extends BaseCcBlockcontents {
         }
     
         $this->fadein = $dt->format('H:i:s.u');
-        $this->modifiedColumns[] = CcPlaylistcontentsPeer::FADEIN;
+        $this->modifiedColumns[] = CcBlockcontentsPeer::FADEIN;
     
         return $this;
     } // setDbFadein()
@@ -68,7 +68,7 @@ class CcBlockcontents extends BaseCcBlockcontents {
      *
      * @param String in format SS.uuuuuu, Datetime, or DateTime accepted string.
      *
-     * @return CcPlaylistcontents The current object (for fluent API support)
+     * @return CcBlockcontents The current object (for fluent API support)
      */
     public function setDbFadeout($v)
     {
@@ -87,7 +87,7 @@ class CcBlockcontents extends BaseCcBlockcontents {
         }
     
         $this->fadeout = $dt->format('H:i:s.u');
-        $this->modifiedColumns[] = CcPlaylistcontentsPeer::FADEOUT;
+        $this->modifiedColumns[] = CcBlockcontentsPeer::FADEOUT;
     
         return $this;
     } // setDbFadeout()