diff --git a/module/program/model.php b/module/program/model.php
index 43be0af9cd..e91039a5ba 100644
--- a/module/program/model.php
+++ b/module/program/model.php
@@ -1344,6 +1344,16 @@ class programModel extends model
                 $projectProduct->product = $productID;
 
                 $this->dao->insert(TABLE_PROJECTPRODUCT)->data($projectProduct)->exec();
+
+                /* Create doc lib. */
+                $this->app->loadLang('doc');
+                $lib = new stdclass();
+                $lib->product = $productID;
+                $lib->name    = $this->lang->doclib->main['product'];
+                $lib->type    = 'product';
+                $lib->main    = '1'; 
+                $lib->acl     = 'default';
+                $this->dao->insert(TABLE_DOCLIB)->data($lib)->exec();
             }
 
             /* Save order. */
diff --git a/module/repo/view/maintain.html.php b/module/repo/view/maintain.html.php
index 3e3145105a..be694c1aed 100644
--- a/module/repo/view/maintain.html.php
+++ b/module/repo/view/maintain.html.php
@@ -34,7 +34,7 @@
           <td class='text'>
           <?php 
 		  $productList = explode(',', str_replace(' ', '', $repo->product));
-          if($productList[0])
+          if(isset($productList) and $productList[0])
           {   
               foreach($productList as $productID) echo ' ' . html::a($this->createLink('product', 'browse', "productID=$productID"), zget($products, $productID, $productID));
           }