Index: /branches/objectmqListeners/src/main/java/omq/common/broker/Broker.java
===================================================================
--- /branches/objectmqListeners/src/main/java/omq/common/broker/Broker.java	(revision 86)
+++ /branches/objectmqListeners/src/main/java/omq/common/broker/Broker.java	(revision 87)
@@ -2,5 +2,4 @@
 
 import java.io.IOException;
-import java.net.URL;
 import java.util.HashMap;
 import java.util.Hashtable;
@@ -23,5 +22,4 @@
 
 import org.apache.log4j.Logger;
-import org.apache.log4j.xml.DOMConfigurator;
 
 import com.rabbitmq.client.Channel;
@@ -49,6 +47,6 @@
 	public Broker(Properties env) throws Exception {
 		// Load log4j configuration
-		URL log4jResource = Broker.class.getResource("/log4j.xml");
-		DOMConfigurator.configure(log4jResource);
+		// URL log4jResource = Broker.class.getResource("/log4j.xml");
+		// DOMConfigurator.configure(log4jResource);
 
 		remoteObjs = new HashMap<String, RemoteObject>();
Index: /branches/objectmqListeners/src/main/java/omq/common/util/Serializer.java
===================================================================
--- /branches/objectmqListeners/src/main/java/omq/common/util/Serializer.java	(revision 86)
+++ /branches/objectmqListeners/src/main/java/omq/common/util/Serializer.java	(revision 87)
@@ -48,9 +48,9 @@
 			try {
 				String className = env.getProperty(ParameterQueue.SERIALIZER_NAME, Serializer.JAVA);
-				
+
 				if (className == null || className.isEmpty()) {
 					throw new ClassNotFoundException("Class name is null or empty.");
 				}
-				
+
 				serializer = getInstance(className);
 			} catch (Exception ex) {
@@ -62,5 +62,5 @@
 	}
 
-	public ISerializer getInstance(String type) throws SerializerException {				
+	public ISerializer getInstance(String type) throws SerializerException {
 		if (KRYO.equals(type)) {
 			if (kryoSerializer == null) {
@@ -79,6 +79,6 @@
 			return javaSerializer;
 		}
-		
-		throw new SerializerException("Serializer not found.");
+
+		throw new SerializerException("Serializer '" + type + "' not found");
 	}
 
Index: anches/objectmqListeners/target/classes/log4j.xml
===================================================================
--- /branches/objectmqListeners/target/classes/log4j.xml	(revision 86)
+++ 	(revision )
@@ -1,37 +1,0 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-<!DOCTYPE log4j:configuration SYSTEM "log4j.dtd">
-
-<log4j:configuration xmlns:log4j="http://jakarta.apache.org/log4j/">
-    <appender name="consoleAppender" class="org.apache.log4j.ConsoleAppender">
-        <param name="Threshold" value="INFO" />
-        <layout class="org.apache.log4j.PatternLayout">
-            <param name="ConversionPattern" value="%d{[yyyy-MM-dd HH:mm:ss]} %-5p %c:%L - %m%n" />
-        </layout>
-    </appender>
-
-    <appender class="org.apache.log4j.rolling.RollingFileAppender" name="A2">
-        <param value="true" name="append"/>
-        <param value="logs/objectmq-temp.log" name="File"/>
-
-        <rollingPolicy class="org.apache.log4j.rolling.FixedWindowRollingPolicy">
-            <param name="fileNamePattern" value="logs/objectmq-%i.log" />
-            <param name="MinIndex" value="0"/> 
-            <param name="MaxIndex" value="1"/> 
-        </rollingPolicy>
-        
-        <triggeringPolicy class="org.apache.log4j.rolling.SizeBasedTriggeringPolicy"> 
-            <param name="MaxFileSize" value="10000000"/> 
-        </triggeringPolicy> 
-        
-        <layout class="org.apache.log4j.PatternLayout">
-            <param value="%d{[yyyy-MM-dd HH:mm:ss]} %-5p %c:%L - %m%n" name="ConversionPattern"/>
-        </layout>        
-    </appender>
-
-  <root> 
-    <priority value ="info" /> 
-    <appender-ref ref="consoleAppender" />
-    <appender-ref ref="A2" />  
-  </root>
-  
-</log4j:configuration>