diff --git a/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/conf/JDBCConfigurationImpl.java b/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/conf/JDBCConfigurationImpl.java
index f511705cb..f6d346aa4 100644
--- a/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/conf/JDBCConfigurationImpl.java
+++ b/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/conf/JDBCConfigurationImpl.java
@@ -838,10 +838,16 @@ public class JDBCConfigurationImpl
 
             return setupConnectionFactory(ds, false);
         }
+        
+        if (log.isTraceEnabled())
+            log.trace("createConnectionFactory: connectionFactory not created yet, attempt JNDI lookup...");
 
         ds = (DataSource) super.getConnectionFactory(); // JNDI lookup
-        if (ds == null)
+        if (ds == null) {
+            if (log.isTraceEnabled())
+                log.trace("createConnectionFactory: JNDI lookup failed, attempt DataSource properties...");
             ds = DataSourceFactory.newDataSource(this, false);
+        }
 
         if (log.isTraceEnabled())
             log.trace("createConnectionFactory: DataSource="+ds);
diff --git a/openjpa-jdbc/src/main/resources/org/apache/openjpa/jdbc/schema/localizer.properties b/openjpa-jdbc/src/main/resources/org/apache/openjpa/jdbc/schema/localizer.properties
index 865576a14..3681d3524 100644
--- a/openjpa-jdbc/src/main/resources/org/apache/openjpa/jdbc/schema/localizer.properties
+++ b/openjpa-jdbc/src/main/resources/org/apache/openjpa/jdbc/schema/localizer.properties
@@ -17,9 +17,10 @@
 
 bad-join: The following error was detected when creating a foreign key: \
 	"{0}".  The foreign key is being ignored.
-no-driver: A JDBC Driver or DataSource class name must be specified in the \
-	ConnectionDriverName property. Available properties in configuration \
-	are "{0}".
+no-driver: Attempting to use persistence.xml properties to resolve the datasource. \
+    A JDBC Driver or DataSource class name must be specified in the \
+    openjpa.ConnectionDriverName or javax.persistence.jdbc.driver property. \
+    Available properties in the configuration are "{0}". 
 bad-driver: The specified driver "{0}" is neither a java.sql.Driver \
 	nor a javax.sql.DataSource class name.
 bad-sch-ref: The schema information table could not be created: {0}