diff --git a/module/admin/config/metriclib.php b/module/admin/config/metriclib.php
index ad0e5db332..ec7c091272 100644
--- a/module/admin/config/metriclib.php
+++ b/module/admin/config/metriclib.php
@@ -1,12 +1,12 @@
 <?php
 $config->admin->metricLib = new stdClass();
-$config->admin->metricLib->updateSQLs[1]  = 'CREATE INDEX IF NOT EXISTS `metricCode_system_date` ON ' . TABLE_METRICLIB . ' (`metricCode`, `system`, `date`)';
-$config->admin->metricLib->updateSQLs[2]  = 'CREATE INDEX IF NOT EXISTS `metricCode_program_date` ON ' . TABLE_METRICLIB . ' (`metricCode`, `program`, `date`)';
-$config->admin->metricLib->updateSQLs[3]  = 'CREATE INDEX IF NOT EXISTS `metricCode_project_date` ON ' . TABLE_METRICLIB . ' (`metricCode`, `project`, `date`)';
-$config->admin->metricLib->updateSQLs[4]  = 'CREATE INDEX IF NOT EXISTS `metricCode_product_date` ON ' . TABLE_METRICLIB . ' (`metricCode`, `product`, `date`)';
-$config->admin->metricLib->updateSQLs[5]  = 'CREATE INDEX IF NOT EXISTS `metricCode_execution_date` ON ' . TABLE_METRICLIB . ' (`metricCode`, `execution`, `date`)';
-$config->admin->metricLib->updateSQLs[6]  = 'CREATE INDEX IF NOT EXISTS `metricCode_user_date` ON ' . TABLE_METRICLIB . ' (`metricCode`, `user`(30), `date`)';
-$config->admin->metricLib->updateSQLs[7]  = 'ALTER TABLE ' . TABLE_METRICLIB . ' DROP INDEX IF EXISTS `metricID`';
-$config->admin->metricLib->updateSQLs[8]  = 'ALTER TABLE ' . TABLE_METRICLIB . ' DROP INDEX IF EXISTS `metricCode`';
-$config->admin->metricLib->updateSQLs[9]  = 'ALTER TABLE ' . TABLE_METRICLIB . ' DROP INDEX IF EXISTS `date`';
-$config->admin->metricLib->updateSQLs[10] = 'ALTER TABLE ' . TABLE_METRICLIB . ' DROP INDEX IF EXISTS `deleted`';
+$config->admin->metricLib->updateSQLs[1]  = 'CREATE INDEX `metricCode_system_date` ON ' . TABLE_METRICLIB . ' (`metricCode`, `system`, `date`)';
+$config->admin->metricLib->updateSQLs[2]  = 'CREATE INDEX `metricCode_program_date` ON ' . TABLE_METRICLIB . ' (`metricCode`, `program`, `date`)';
+$config->admin->metricLib->updateSQLs[3]  = 'CREATE INDEX `metricCode_project_date` ON ' . TABLE_METRICLIB . ' (`metricCode`, `project`, `date`)';
+$config->admin->metricLib->updateSQLs[4]  = 'CREATE INDEX `metricCode_product_date` ON ' . TABLE_METRICLIB . ' (`metricCode`, `product`, `date`)';
+$config->admin->metricLib->updateSQLs[5]  = 'CREATE INDEX `metricCode_execution_date` ON ' . TABLE_METRICLIB . ' (`metricCode`, `execution`, `date`)';
+$config->admin->metricLib->updateSQLs[6]  = 'CREATE INDEX `metricCode_user_date` ON ' . TABLE_METRICLIB . ' (`metricCode`, `user`(30), `date`)';
+$config->admin->metricLib->updateSQLs[7]  = 'ALTER TABLE ' . TABLE_METRICLIB . ' DROP INDEX `metricID`';
+$config->admin->metricLib->updateSQLs[8]  = 'ALTER TABLE ' . TABLE_METRICLIB . ' DROP INDEX `metricCode`';
+$config->admin->metricLib->updateSQLs[9]  = 'ALTER TABLE ' . TABLE_METRICLIB . ' DROP INDEX `date`';
+$config->admin->metricLib->updateSQLs[10] = 'ALTER TABLE ' . TABLE_METRICLIB . ' DROP INDEX `deleted`';
diff --git a/module/admin/control.php b/module/admin/control.php
index 8c0c57d5f9..b22def7a29 100755
--- a/module/admin/control.php
+++ b/module/admin/control.php
@@ -373,14 +373,13 @@ class admin extends control
             try
             {
                 $this->dbh->exec($sql);
-
-                if(isset($this->config->admin->metricLib->updateSQLs[++$key])) return $this->send(['result' => 'success', 'key' => $key]);
-                return $this->send(['result' => 'success']);
             }
             catch(PDOException $e)
             {
-                return $this->sendError($e->getMessage());
+                $this->app->triggerError($e->getMessage(), __FILE__, __LINE__);
             }
+            if(isset($this->config->admin->metricLib->updateSQLs[++$key])) return $this->send(['result' => 'success', 'key' => $key]);
+            return $this->send(['result' => 'success']);
         }
 
         $this->view->title = $this->lang->metriclib->common;