diff --git a/lib/Doctrine/Connection/Module.php b/lib/Doctrine/Connection/Module.php
index 94c51ccb6..514157f28 100644
--- a/lib/Doctrine/Connection/Module.php
+++ b/lib/Doctrine/Connection/Module.php
@@ -43,7 +43,10 @@ class Doctrine_Connection_Module {
      * @param Doctrine_Connection $conn     Doctrine_Connection object, every connection
      *                                      module holds an instance of Doctrine_Connection
      */
-    public function __construct(Doctrine_Connection $conn) {
+    public function __construct($conn = null) {
+        if( ! ($conn instanceof Doctrine_Connection))
+            $conn = Doctrine_Manager::getInstance()->getCurrentConnection();
+            
         $this->conn = $conn;
         
         $e = explode('_', get_class($this));