diff --git a/TASMAN-core/src/main/java/it/inaf/ia2/tsm/datalayer/DataSourceWrapper.java b/TASMAN-core/src/main/java/it/inaf/ia2/tsm/datalayer/DataSourceWrapper.java
index 4f020e095639c4642beefd4df610bfe02a41b8f3..a088222e25c8e371cae78c07d690029f97ae8575 100644
--- a/TASMAN-core/src/main/java/it/inaf/ia2/tsm/datalayer/DataSourceWrapper.java
+++ b/TASMAN-core/src/main/java/it/inaf/ia2/tsm/datalayer/DataSourceWrapper.java
@@ -65,7 +65,7 @@ public class DataSourceWrapper implements Serializable {
             ds.setDriverClassName(driverClassName);
             ds.setUrl(url);
             ds.setUsername(credentials.getUsername());
-            ds.setPassword(credentials.getPassword());
+            ds.setPassword(credentials.getPassword() != null ? credentials.getPassword() : "");
             ds.setInitialSize(5);
             ds.setMaxActive(10);
             ds.setMaxIdle(5);