Index: testing/org/apache/derbyTesting/functionTests/tests/derbynet/testSecMec.java
===================================================================
--- testing/org/apache/derbyTesting/functionTests/tests/derbynet/testSecMec.java	(revision 209611)
+++ testing/org/apache/derbyTesting/functionTests/tests/derbynet/testSecMec.java	(working copy)
@@ -196,7 +196,7 @@
 			System.out.println(msg +" OK");
 		}
 		catch (Exception e)
-		{
+		{       
 			System.out.println(msg +"EXCEPTION testSecurityMechanism()  " + e.getMessage());
 		}
 	}
Index: client/org/apache/derby/jdbc/ClientBaseDataSource.java
===================================================================
--- client/org/apache/derby/jdbc/ClientBaseDataSource.java	(revision 209611)
+++ client/org/apache/derby/jdbc/ClientBaseDataSource.java	(working copy)
@@ -782,7 +782,7 @@
         return getUpgradedSecurityMechanism(securityMechanism, password);
     }
 
-    protected String connectionAttributes = "";
+    protected String connectionAttributes = null;
 
     /**
      * Set this property to pass in more Derby specific connection URL attributes.
@@ -880,6 +880,10 @@
      * when set connection attributes is called.
      */
     void updateDataSourceValues(Properties prop) {
+        if (prop == null) {
+            return;
+        }
+        
         if (prop.containsKey(propertyKey_user)) {
             setUser(getUser(prop));
         }
Index: client/org/apache/derby/client/am/Connection.java
===================================================================
--- client/org/apache/derby/client/am/Connection.java	(revision 209611)
+++ client/org/apache/derby/client/am/Connection.java	(working copy)
@@ -156,7 +156,11 @@
 
         // Extract common properties.
         // Derby-409 fix
-        databaseName_ = dataSource.getDatabaseName() + ";" + dataSource.getConnectionAttributes();
+        if (dataSource.getConnectionAttributes() != null) {
+            databaseName_ = dataSource.getDatabaseName() + ";" + dataSource.getConnectionAttributes();
+        } else {
+            databaseName_ = dataSource.getDatabaseName();
+        }
         retrieveMessageText_ = dataSource.getRetrieveMessageText();
 
         loginTimeout_ = dataSource.getLoginTimeout();