diff --git a/java/src/main/java/com/genexus/GXProcedure.java b/java/src/main/java/com/genexus/GXProcedure.java
index f405da731..176565c53 100644
--- a/java/src/main/java/com/genexus/GXProcedure.java
+++ b/java/src/main/java/com/genexus/GXProcedure.java
@@ -135,15 +135,30 @@ protected boolean isRemoteProcedure()
 	{
 		return Application.isRemoteProcedure(context, remoteHandle, location);
 	}
-
+	protected boolean batchCursorHolder(){ return false;}
+	protected void exitApp()
+	{
+		exitApplication(batchCursorHolder());
+	}
+	/**
+	 * @deprecated use exitApp()
+	 * */
 	protected void exitApplication()
+	{
+		exitApplication(true);
+	}
+	private void exitApplication(boolean flushBuffers)
 	{
 		if(dbgInfo != null && Application.realMainProgram == this)
 			dbgInfo.onExit();
-		try
-		{
-			Application.getConnectionManager().flushBuffers(remoteHandle, this);
-		}catch(Exception exception){ ; }
+
+		if (flushBuffers) {
+			try {
+				Application.getConnectionManager().flushBuffers(remoteHandle, this);
+			} catch (Exception exception) {
+				;
+			}
+		}
 		if(disconnectUserAtCleanup)
 		{
 			try