diff --git a/lib/Doctrine/Configurable.php b/lib/Doctrine/Configurable.php
index b82669fdb..7299356b7 100644
--- a/lib/Doctrine/Configurable.php
+++ b/lib/Doctrine/Configurable.php
@@ -151,14 +151,20 @@ abstract class Doctrine_Configurable extends Doctrine_Locator_Injectable
 
     public function getParams($namespace = null)
     {
-    	if (isset($namespace)) {
-            if ( ! isset($this->_params[$namespace])) {
-                return null;
-            }
-            
-            return $this->_params[$namespace];
+    	if ($namespace = null) {
+    	    $namespace = $this->getAttribute(Doctrine::ATTR_DEFAULT_PARAM_NAMESPACE);
     	}
-        return $his->_params;
+    	
+    	if ( ! isset($this->_params[$namespace])) {
+    	    return null;
+    	}
+
+        return $this->_params[$namespace];
+    }
+    
+    public function getParamNamespaces()
+    {
+        return array_keys($this->_params);	
     }
 
     public function setParam($name, $value, $namespace = null)