diff --git a/Logger/PropelLogger.php b/Logger/PropelLogger.php
index 45e5876..ee07bee 100644
--- a/Logger/PropelLogger.php
+++ b/Logger/PropelLogger.php
@@ -52,7 +52,9 @@ class PropelLogger implements \BasicLogger
      */
     public function alert($message)
     {
-      $this->logger->alert($message);
+        if (null !== $this->logger) {
+            $this->logger->alert($message);
+        }
     }
 
     /**
@@ -62,7 +64,9 @@ class PropelLogger implements \BasicLogger
      */
     public function crit($message)
     {
-      $this->logger->crit($message);
+        if (null !== $this->logger) {
+            $this->logger->crit($message);
+        }
     }
 
     /**
@@ -72,7 +76,9 @@ class PropelLogger implements \BasicLogger
      */
     public function err($message)
     {
-      $this->logger->err($message);
+        if (null !== $this->logger) {
+            $this->logger->err($message);
+        }
     }
 
     /**
@@ -82,7 +88,9 @@ class PropelLogger implements \BasicLogger
      */
     public function warning($message)
     {
-      $this->logger->warning($message);
+        if (null !== $this->logger) {
+            $this->logger->warning($message);
+        }
     }
 
     /**
@@ -92,7 +100,9 @@ class PropelLogger implements \BasicLogger
      */
     public function notice($message)
     {
-      $this->logger->notice($message);
+        if (null !== $this->logger) {
+            $this->logger->notice($message);
+        }
     }
 
     /**
@@ -102,7 +112,9 @@ class PropelLogger implements \BasicLogger
      */
     public function info($message)
     {
-      $this->logger->info($message);
+        if (null !== $this->logger) {
+            $this->logger->info($message);
+        }
     }
 
     /**
@@ -112,6 +124,8 @@ class PropelLogger implements \BasicLogger
      */
     public function debug($message)
     {
-      $this->logger->debug($message);
+        if (null !== $this->logger) {
+            $this->logger->debug($message);
+        }
     }
 }
diff --git a/Resources/config/propel.xml b/Resources/config/propel.xml
index 34b38bb..e0a1d5e 100644
--- a/Resources/config/propel.xml
+++ b/Resources/config/propel.xml
@@ -8,12 +8,20 @@
         <parameter key="propel.configuration.class">PropelConfiguration</parameter>
         <parameter key="propel.logger.class">Propel\PropelBundle\Logger\PropelLogger</parameter>
         <parameter key="propel.dbal.default_connection">default</parameter>
+        <parameter key="propel.data_collector.class">Propel\PropelBundle\DataCollector\PropelDataCollector</parameter>
     </parameters>
 
     <services>
         <service id="propel.configuration" class="%propel.configuration.class%" />
         <service id="propel.logger" class="%propel.logger.class%">
+            <tag name="monolog.logger" channel="doctrine" />
             <argument type="service" id="logger" on-invalid="null" />
         </service>
+
+        <service id="data_collector.propel" class="%propel.data_collector.class%" public="false">
+            <tag name="data_collector" template="PropelBundle:Collector:propel" id="propel" />
+            <argument type="service" id="propel.logger" />
+            <argument>%propel.dbal.default_connection%</argument>
+        </service>
     </services>
 </container>