diff --git a/lib/enrollib.php b/lib/enrollib.php
index 4154db427da..62e791ae2e5 100644
--- a/lib/enrollib.php
+++ b/lib/enrollib.php
@@ -1039,10 +1039,7 @@ abstract class enrol_plugin {
     protected function load_config() {
         if (!isset($this->config)) {
             $name = $this->get_name();
-            if (!$config = get_config("enrol_$name")) {
-                $config = new stdClass();
-            }
-            $this->config = $config;
+            $this->config = get_config("enrol_$name");
         }
     }
 
diff --git a/message/lib.php b/message/lib.php
index 023b9948e3d..eb1b2c156bd 100644
--- a/message/lib.php
+++ b/message/lib.php
@@ -2347,11 +2347,7 @@ function get_message_processor($type) {
  * @return object $processors object containing information on message processors
  */
 function get_message_output_default_preferences() {
-    $preferences = get_config('message');
-    if (!$preferences) {
-        $preferences = new stdClass();
-    }
-    return $preferences;
+    return get_config('message');
 }
 
 /**