diff --git a/application/controllers/InstallerController.php b/application/controllers/InstallerController.php
index 56a4a61da8c..d211bf4aa8f 100644
--- a/application/controllers/InstallerController.php
+++ b/application/controllers/InstallerController.php
@@ -235,6 +235,13 @@ private function stepDatabaseConfiguration()
         $aData['classesForStep'] = array('off','off','off','on','off','off');
         $aData['progressValue'] = 40;
         $aData['model'] = $oModel = new InstallerConfigForm;
+        if (isset(Yii::app()->session['populateerror']))
+        {
+            $oModel->addError('dblocation',Yii::app()->session['populateerror']);
+            $oModel->addError('dbpwd','');
+            $oModel->addError('dbuser','');
+            unset(Yii::app()->session['populateerror']);
+        }
 
         if(!is_null(Yii::app()->request->getPost('InstallerConfigForm')))
         {
@@ -586,12 +593,15 @@ function stepPopulateDb()
         }
         else
         {
-            $sConfirmation = gT('Database was populated but there were errors:').'<p><ul>';
+            $sConfirmation = gT('There were errors when trying to populate the database :').'<p><ul>';
             foreach ($aErrors as $sError)
             {
                 $sConfirmation.='<li>'.htmlspecialchars($sError).'</li>';
             }
             $sConfirmation.='</ul>';
+            Yii::app()->session['populateerror']=$sConfirmation;
+
+            $this->redirect(array('installer/database'));
         }
 
         Yii::app()->session['tablesexist'] = true;
@@ -928,16 +938,20 @@ function check_DirectoryWriteable($directory, &$data, $base, $keyError, $bRecurs
     function _setup_tables($sFileName, $aDbConfig = array(), $sDatabasePrefix = '')
     {
         extract(empty($aDbConfig) ? self::_getDatabaseConfig() : $aDbConfig);
-        switch ($sDatabaseType) {
-            case 'mysql':
-            case 'mysqli':
-                $this->connection->createCommand("ALTER DATABASE ". $this->connection->quoteTableName($sDatabaseName) ." DEFAULT CHARACTER SET utf8 COLLATE utf8_unicode_ci;")->execute();
-                break;
-            case 'pgsql':
-                if (version_compare($this->connection->getServerVersion(),'9','>=')) {
-                    $this->connection->createCommand("ALTER DATABASE ". $this->connection->quoteTableName($sDatabaseName) ." SET bytea_output='escape';")->execute();
-                }
-                break;
+        try{
+            switch ($sDatabaseType) {
+                case 'mysql':
+                case 'mysqli':
+                    $this->connection->createCommand("ALTER DATABASE ". $this->connection->quoteTableName($sDatabaseName) ." DEFAULT CHARACTER SET utf8 COLLATE utf8_unicode_ci;")->execute();
+                    break;
+                case 'pgsql':
+                    if (version_compare($this->connection->getServerVersion(),'9','>=')) {
+                        $this->connection->createCommand("ALTER DATABASE ". $this->connection->quoteTableName($sDatabaseName) ." SET bytea_output='escape';")->execute();
+                    }
+                    break;
+            }
+        } catch(Exception $e) {
+            return array($e->getMessage());
         }
 
         return $this->_executeSQLFile($sFileName, $sDatabasePrefix);