diff --git a/NEWS b/NEWS
index 95735f14..7cd168bb 100644
--- a/NEWS
+++ b/NEWS
@@ -1,3 +1,5 @@
+    - enable error messages for config_load errors,
+      use $this->config_class for loading class name (Monte)
     - fix html_options to not escape already escaped entities (Monte)
     - send Last-Modified header on cache creation (Monte)
     - check strict syntax of function attributes (Monte) 
diff --git a/Smarty.class.php b/Smarty.class.php
index 89bad9d2..0984a509 100644
--- a/Smarty.class.php
+++ b/Smarty.class.php
@@ -1269,14 +1269,14 @@ class Smarty
         if($_compile_config) {
             if(!is_object($this->_conf_obj)) {
                 require_once SMARTY_DIR . $this->config_class . '.class.php';
-                $this->_conf_obj = new Config_File($_config_dir);
+                $this->_conf_obj = new $this->config_class($_config_dir);
                 $this->_conf_obj->overwrite = $this->config_overwrite;
                 $this->_conf_obj->booleanize = $this->config_booleanize;
                 $this->_conf_obj->read_hidden = $this->config_read_hidden;
                 $this->_conf_obj->fix_newlines = $this->config_fix_newlines;
                 $this->_conf_obj->set_path = $_config_dir;
             }
-            if($_config_vars = @array_merge($this->_conf_obj->get($file),
+            if($_config_vars = array_merge($this->_conf_obj->get($file),
                     $this->_conf_obj->get($file, $section))) {
                 if(function_exists('var_export')) {
                     $_compile_data = '<?php $_config_vars = ' . var_export($_config_vars, true) . '; return true; ?>';                    
diff --git a/libs/Smarty.class.php b/libs/Smarty.class.php
index 89bad9d2..0984a509 100644
--- a/libs/Smarty.class.php
+++ b/libs/Smarty.class.php
@@ -1269,14 +1269,14 @@ class Smarty
         if($_compile_config) {
             if(!is_object($this->_conf_obj)) {
                 require_once SMARTY_DIR . $this->config_class . '.class.php';
-                $this->_conf_obj = new Config_File($_config_dir);
+                $this->_conf_obj = new $this->config_class($_config_dir);
                 $this->_conf_obj->overwrite = $this->config_overwrite;
                 $this->_conf_obj->booleanize = $this->config_booleanize;
                 $this->_conf_obj->read_hidden = $this->config_read_hidden;
                 $this->_conf_obj->fix_newlines = $this->config_fix_newlines;
                 $this->_conf_obj->set_path = $_config_dir;
             }
-            if($_config_vars = @array_merge($this->_conf_obj->get($file),
+            if($_config_vars = array_merge($this->_conf_obj->get($file),
                     $this->_conf_obj->get($file, $section))) {
                 if(function_exists('var_export')) {
                     $_compile_data = '<?php $_config_vars = ' . var_export($_config_vars, true) . '; return true; ?>';