diff --git a/extend/src/org/adempiere/process/rpl/exp/TopicExportProcessor.java b/extend/src/org/adempiere/process/rpl/exp/TopicExportProcessor.java
index a69b7e2786..e8bd526034 100644
--- a/extend/src/org/adempiere/process/rpl/exp/TopicExportProcessor.java
+++ b/extend/src/org/adempiere/process/rpl/exp/TopicExportProcessor.java
@@ -151,7 +151,6 @@ public class TopicExportProcessor implements IExportProcessor {
 				connection = connectionFactory.createConnection();
 			}
 			
-			connection.setClientID( clientID );
 			connection.start();
 			
 			// Create a Session
diff --git a/serverRoot/src/main/server/org/adempiere/server/rpl/imp/TopicListener.java b/serverRoot/src/main/server/org/adempiere/server/rpl/imp/TopicListener.java
index f88f558eac..eb4d4d0366 100644
--- a/serverRoot/src/main/server/org/adempiere/server/rpl/imp/TopicListener.java
+++ b/serverRoot/src/main/server/org/adempiere/server/rpl/imp/TopicListener.java
@@ -31,6 +31,7 @@ package org.adempiere.server.rpl.imp;
 import java.util.Properties;
 
 import javax.jms.Connection;
+import javax.jms.InvalidClientIDException;
 import javax.jms.JMSException;
 import javax.jms.Message;
 import javax.jms.MessageConsumer;
@@ -187,7 +188,15 @@ public class TopicListener implements MessageListener {
 		
 		log.finest("conn = " + conn );
 		
+		try {
 		conn.setClientID( clientID );
+		} catch (InvalidClientIDException e) {
+			// TODO find a better way to check whether the connection already
+			// exists
+			log.config("Connection with clientID '" + clientID
+					   + "' already exists");
+			return;
+		}	
 		
 		session = conn.createSession(false, Session.AUTO_ACKNOWLEDGE); // TODO - could be parameter
 		log.finest("session = " + session );