diff --git a/org.adempiere.base/src/org/compiere/util/DB.java b/org.adempiere.base/src/org/compiere/util/DB.java
index 1cf89aef8b..828e846d09 100644
--- a/org.adempiere.base/src/org/compiere/util/DB.java
+++ b/org.adempiere.base/src/org/compiere/util/DB.java
@@ -1011,19 +1011,56 @@ public final class DB
 		CPreparedStatement cs = ProxyFactory.newCPreparedStatement(ResultSet.TYPE_FORWARD_ONLY,
 			ResultSet.CONCUR_UPDATABLE, sql, trxName);	//	converted in call
 
+		boolean autoCommit = false;
+		int currentTimeout = 0;
 		try
 		{
 			setParameters(cs, params);
+			autoCommit = cs.getConnection().getAutoCommit();
+			//set timeout
 			if (timeOut > 0)
-				cs.setQueryTimeout(timeOut);
+			{
+				if (DB.isPostgreSQL())
+				{
+					try
+					{
+						Connection conn = cs.getConnection();
+						if (autoCommit)
+						{
+							conn.setAutoCommit(false);
+						}
+						else
+						{
+							ResultSet rs = null;
+							try
+							{
+								rs = conn.createStatement().executeQuery("select current_setting('statement_timeout')");
+								if (rs.next())
+									currentTimeout = rs.getInt(1);
+							}
+							finally
+							{
+								DB.close(rs);
+							}
+						}
+						Statement timeoutStatement = conn.createStatement();
+						timeoutStatement.execute("SET LOCAL statement_timeout TO " + ( timeOut * 1000 ));
+						if (log.isLoggable(Level.FINEST))
+						{
+							log.finest("Set statement timeout to " + timeOut);
+						}
+					} catch (SQLException e) {}
+				}
+				else
+				{
+					cs.setQueryTimeout(timeOut);
+				}
+			}
 			no = cs.executeUpdate();
 			//	No Transaction - Commit
 			if (trxName == null)
 			{
 				cs.commit();	//	Local commit
-			//	Connection conn = cs.getConnection();
-			//	if (conn != null && !conn.getAutoCommit())	//	is null for remote
-			//		conn.commit();
 			}
 		}
 		catch (Exception e)
@@ -1040,15 +1077,40 @@ public final class DB
 		}
 		finally
 		{
+			if (DB.isPostgreSQL() && timeOut > 0)
+			{
+				try
+				{
+					if (autoCommit)
+					{
+						cs.getConnection().setAutoCommit(true);
+					}
+					else
+					{
+						if (currentTimeout > 0)
+						{
+							Statement timeoutStatement = cs.getConnection().createStatement();
+							timeoutStatement.execute("SET LOCAL statement_timeout TO " + ( currentTimeout * 1000 ));
+							if (log.isLoggable(Level.FINEST))
+							{
+								log.finest("Reset statement timeout to " + currentTimeout);
+							}
+						}
+						else
+						{
+							Statement timeoutStatement = cs.getConnection().createStatement();
+							timeoutStatement.execute("SET LOCAL statement_timeout TO Default");
+							if (log.isLoggable(Level.FINEST))
+							{
+								log.finest("Reset statement timeout to default");
+							}
+						}
+					}
+				}
+				catch (SQLException e) {}
+			}
 			//  Always close cursor
-			try
-			{
-				cs.close();
-			}
-			catch (SQLException e2)
-			{
-				log.log(Level.SEVERE, "Cannot close statement");
-			}
+			close(cs);
 		}
 		return no;
 	}	//	executeUpdate
@@ -1085,11 +1147,50 @@ public final class DB
 		CPreparedStatement cs = ProxyFactory.newCPreparedStatement(ResultSet.TYPE_FORWARD_ONLY,
 			ResultSet.CONCUR_UPDATABLE, sql, trxName);	//	converted in call
 
+		boolean autoCommit = false;
+		int currentTimeout = 0;
 		try
 		{
+			autoCommit = cs.getConnection().getAutoCommit();
 			setParameters(cs, params);
 			if (timeOut > 0)
-				cs.setQueryTimeout(timeOut);
+			{
+				if (DB.isPostgreSQL())
+				{
+					try
+					{
+						Connection conn = cs.getConnection();
+						if (autoCommit)
+						{
+							conn.setAutoCommit(false);
+						}
+						else
+						{
+							ResultSet rs = null;
+							try
+							{
+								rs = conn.createStatement().executeQuery("select current_setting('statement_timeout')");
+								if (rs.next())
+									currentTimeout = rs.getInt(1);
+							}
+							finally
+							{
+								DB.close(rs);
+							}
+						}
+						Statement timeoutStatement = conn.createStatement();
+						timeoutStatement.execute("SET LOCAL statement_timeout TO " + ( timeOut * 1000 ));
+						if (log.isLoggable(Level.FINEST))
+						{
+							log.finest("Set statement timeout to " + timeOut);
+						}
+					} catch (SQLException e) {}
+				}
+				else
+				{
+					cs.setQueryTimeout(timeOut);
+				}
+			}
 			no = cs.executeUpdate();
 			//	No Transaction - Commit
 			if (trxName == null)
@@ -1103,6 +1204,38 @@ public final class DB
 		}
 		finally
 		{
+			if (DB.isPostgreSQL() && timeOut > 0)
+			{
+				try {
+					if (autoCommit)
+					{
+						cs.getConnection().setAutoCommit(true);
+					}
+					else
+					{
+						if (currentTimeout > 0)
+						{
+							Statement timeoutStatement = cs.getConnection().createStatement();
+							timeoutStatement.execute("SET LOCAL statement_timeout TO " + ( currentTimeout * 1000 ));
+							if (log.isLoggable(Level.FINEST))
+							{
+								log.finest("Reset statement timeout to " + currentTimeout);
+							}
+						}
+						else
+						{
+							Statement timeoutStatement = cs.getConnection().createStatement();
+							timeoutStatement.execute("SET LOCAL statement_timeout TO Default");
+							if (log.isLoggable(Level.FINEST))
+							{
+								log.finest("Reset statement timeout to default");
+							}
+
+						}
+					}
+				} catch (SQLException e) {
+				}
+			}
 			DB.close(cs);
 		}
 		return no;
@@ -1885,10 +2018,8 @@ public final class DB
 	public static void printWarning (String comment, SQLWarning warning)
 	{
 		if (comment == null || warning == null || comment.length() == 0)
-			throw new IllegalArgumentException("Required parameter missing");
-		log.warning(comment);
-		if (warning == null)
 			return;
+		log.warning(comment);
 		//
 		SQLWarning warn = warning;
 		while (warn != null)