diff --git a/activemq-ra/src/main/java/org/apache/activemq/ra/ActiveMQConnectionFactory.java b/activemq-ra/src/main/java/org/apache/activemq/ra/ActiveMQConnectionFactory.java
index 10ea24c2c1..eb018a2259 100755
--- a/activemq-ra/src/main/java/org/apache/activemq/ra/ActiveMQConnectionFactory.java
+++ b/activemq-ra/src/main/java/org/apache/activemq/ra/ActiveMQConnectionFactory.java
@@ -1,4 +1,4 @@
-/**
+    /**
  *
  * Copyright 2005-2006 The Apache Software Foundation
  *
@@ -85,6 +85,9 @@ public class ActiveMQConnectionFactory implements ConnectionFactory, QueueConnec
             if( info.isUseInboundSessionEnabled() ) {
                 return new InboundConnectionProxy();
             }
+            if (manager == null) {
+                throw new JMSException("No JCA ConnectionManager configured! Either enable UseInboundSessionEnabled or get your JCA container to configure one.");
+            }
             return (Connection) manager.allocateConnection(factory, info);
         }
         catch (ResourceException e) {