diff --git a/module/bug/control.php b/module/bug/control.php
index bef538e9e7..21d593ebd3 100644
--- a/module/bug/control.php
+++ b/module/bug/control.php
@@ -292,7 +292,6 @@ class bug extends control
             $builds  = $this->loadModel('build')->getProductBuildPairs($productID, 'noempty');
             $stories = $this->story->getProductStoryPairs($productID);
         }
-
         $this->view->header->title = $this->products[$productID] . $this->lang->colon . $this->lang->bug->create;
         $this->view->position[]    = html::a($this->createLink('bug', 'browse', "productID=$productID"), $this->products[$productID]);
         $this->view->position[]    = $this->lang->bug->create;
diff --git a/module/build/model.php b/module/build/model.php
index 35f02f5a35..b2c065ba0f 100644
--- a/module/build/model.php
+++ b/module/build/model.php
@@ -101,7 +101,12 @@ class buildModel extends model
             ->where('product')->eq((int)$productID)
             ->andWhere('deleted')->eq(0)
             ->orderBy('date desc, id desc')->fetchPairs();
+        $release = $this->dao->select('name')->from(TABLE_RELEASE)
+            ->where('build')->eq(0)
+            ->andWhere('deleted')->eq(0)
+            ->fetchPairs();
         if(!$builds) return $sysBuilds;
+        foreach($release as $buildID => $releaseName) $builds[$buildID] = $releaseName;
         return $sysBuilds + $builds;
     }
 
diff --git a/module/release/config.php b/module/release/config.php
index 06755959a0..d9aa663065 100644
--- a/module/release/config.php
+++ b/module/release/config.php
@@ -1,6 +1,6 @@
 <?php
-$config->release->create->requiredFields = 'name,build,date';
-$config->release->edit->requiredFields   = 'name,build,date';
+$config->release->create->requiredFields = 'name,date';
+$config->release->edit->requiredFields   = 'name,date';
 
 $config->release->editor->create = array('id' => 'desc', 'tools' => 'simpleTools');
 $config->release->editor->edit   = array('id' => 'desc', 'tools' => 'simpleTools');
diff --git a/module/release/control.php b/module/release/control.php
index d491977226..e4164fb5f6 100644
--- a/module/release/control.php
+++ b/module/release/control.php
@@ -102,11 +102,18 @@ class release extends control
         $release = $this->release->getById((int)$releaseID);
         $this->commonAction($release->product);
         $build = $this->build->getById($release->build);
-
+        if($release->build !=0)
+        {
         /* Get stories and bugs. */
         $orderBy = 'status_asc, stage_asc, id_desc';
         $stories = $this->story->getProjectStories($build->project, $orderBy);
         $bugs    = $this->bug->getProjectBugs($build->project); 
+        }
+        else
+        {
+            $stories = array();
+            $bugs    = array();
+        }
 
         $this->view->header->title = $this->lang->release->edit;
         $this->view->position[]    = $this->lang->release->edit;
diff --git a/module/release/model.php b/module/release/model.php
index 7c80efe291..a55812f9ff 100644
--- a/module/release/model.php
+++ b/module/release/model.php
@@ -82,7 +82,7 @@ class releaseModel extends model
             ->join('bugs', ',')
             ->remove('allchecker')
             ->get();
-        $this->dao->insert(TABLE_RELEASE)->data($release)->autoCheck()->batchCheck($this->config->release->create->requiredFields, 'notempty')->check('name','unique')->exec();
+        $this->dao->insert(TABLE_RELEASE)->data($release)->batchCheck($this->config->release->create->requiredFields, 'notempty')->check('name','unique')->exec();
         $releaseID = $this->dao->lastInsertID();
         $this->dao->update(TABLE_STORY)->set('stage')->eq('released')->where('id')->in($release->stories)->exec();
         if(!dao::isError()) return $releaseID;
@@ -106,7 +106,6 @@ class releaseModel extends model
             ->join('bugs', ',')
             ->get();
         $this->dao->update(TABLE_RELEASE)->data($release)
-            ->autoCheck()
             ->batchCheck($this->config->release->edit->requiredFields, 'notempty')
             ->check('name','unique', "id != $releaseID")
             ->where('id')->eq((int)$releaseID)
diff --git a/module/release/view/create.html.php b/module/release/view/create.html.php
index eea1684097..9a5ae73be6 100644
--- a/module/release/view/create.html.php
+++ b/module/release/view/create.html.php
@@ -25,7 +25,6 @@
       <td>
       <?php  
           echo html::select('build', $builds, '', "class='select-3' onchange=loadStoriesAndBugs(this.value,$productID)");
-          unset($builds['']);
           if(empty($builds)) echo $lang->build->notice;
       ?>
       </td>