diff --git a/client/src/session/remote/actions.cc b/client/src/session/remote/actions.cc
index 30eef3c..110a0c7 100644
--- a/client/src/session/remote/actions.cc
+++ b/client/src/session/remote/actions.cc
@@ -102,7 +102,7 @@
 			.call();
 
 		if(seconds)
-			this->waitForReady(seconds);
+			this->waitForConnectionState(CONNECTED_TN3270E,seconds);
 
 	}
 
diff --git a/client/src/testprogram/testprogram.cc b/client/src/testprogram/testprogram.cc
index 0732730..072a64d 100644
--- a/client/src/testprogram/testprogram.cc
+++ b/client/src/testprogram/testprogram.cc
@@ -171,7 +171,6 @@
 		TN3270::Host host{session};
 
 		host.connect();
-		host.wait(TN3270::CONNECTED_TN3270E);
 
 		{
 			auto start = time(nullptr);
diff --git a/server/src/core/methods/methods.c b/server/src/core/methods/methods.c
index 769922a..85e74d9 100644
--- a/server/src/core/methods/methods.c
+++ b/server/src/core/methods/methods.c
@@ -80,7 +80,7 @@ int ipc3270_method_call(GObject *object, const gchar *method_name, GVariant *req
 	size_t	  ix;
 	H3270	* hSession = ipc3270_get_session(object);
 
-	debug("%s(%s,request=%p,response=%p)",__FUNCTION__,method_name,request,response);
+	debug("%s(%s,request=%p,response=%p,error=%p)",__FUNCTION__,method_name,request,response,*error);
 
 	lib3270_write_event_trace(hSession,"Method %s called on session %c\n",method_name,lib3270_get_session_id(hSession));
 
@@ -90,7 +90,7 @@ int ipc3270_method_call(GObject *object, const gchar *method_name, GVariant *req
 
 			int rc = methods[ix].call(object,request,response,error);
 
-			debug("rc=%d",rc);
+			debug("rc=%d error=%p",rc,*error);
 
 			if(rc)
 				ipc3270_set_error(object,rc,error);
diff --git a/server/src/core/methods/wait.c b/server/src/core/methods/wait.c
index f7093b9..c42263a 100644
--- a/server/src/core/methods/wait.c
+++ b/server/src/core/methods/wait.c
@@ -119,7 +119,8 @@ int ipc3270_method_wait_for_ready(GObject *session, GVariant *request, GObject *
 int ipc3270_method_wait_for_cstate(GObject *session, GVariant *request, GObject *response, GError G_GNUC_UNUSED(**error)) {
 	guint seconds = 1;
 	guint cstate = 0;
-	g_variant_get(request, "(uu)", &seconds);
+	g_variant_get(request, "(uu)", &cstate, &seconds);
+	debug("cstate=%u seconds=%u",cstate,seconds);
 	ipc3270_response_append_int32(response,lib3270_wait_for_cstate(ipc3270_get_session(session),(LIB3270_CSTATE) cstate, seconds));
 	return 0;
 }
diff --git a/server/src/core/windows/pipesource.c b/server/src/core/windows/pipesource.c
index 704a66b..6842421 100644
--- a/server/src/core/windows/pipesource.c
+++ b/server/src/core/windows/pipesource.c
@@ -110,6 +110,8 @@ static void process_input(IPC3270_PIPE_SOURCE *source, DWORD cbRead) {
 	g_autoptr (GVariant) response = NULL;
 	g_autoptr (GVariant) parameters = ipc3270_unpack(source->buffer, &request_type);
 
+	debug("************ error=%p",error);
+
 	if(parameters) {
 
 		// Process query
@@ -129,9 +131,12 @@ static void process_input(IPC3270_PIPE_SOURCE *source, DWORD cbRead) {
 
 				debug("Parameters: %p", parameters);
 				debug("rsp: %p", rsp);
+				debug("Error=%p",error);
 
 				ipc3270_method_call(source->object, request_name, parameters, rsp, &error);
 
+				debug("Error=%p",error);
+
 				if(ipc3270_response_has_values(rsp))
 					response = ipc3270_response_steal_value(rsp);
 
diff --git a/server/src/core/windows/response.c b/server/src/core/windows/response.c
index a0b7150..c00c6f1 100644
--- a/server/src/core/windows/response.c
+++ b/server/src/core/windows/response.c
@@ -93,6 +93,8 @@ GObject * ipc3270_response_new() {
 
 void ipc3270_response_append_int32(GObject *object, gint32 value) {
 
+	debug("%s(%d)",__FUNCTION__,value);
+
 	ipc3270Response * response = IPC3270_RESPONSE(object);
 
 	if(response->value)
diff --git a/server/src/testprogram/testprogram.c b/server/src/testprogram/testprogram.c
index 96a71d2..b91ed6d 100644
--- a/server/src/testprogram/testprogram.c
+++ b/server/src/testprogram/testprogram.c
@@ -213,7 +213,7 @@
 	if(url) {
 
 		v3270_set_url(terminal,url);
-		v3270_reconnect(terminal);
+		//v3270_reconnect(terminal);
 
 		gchar * title = g_strdup_printf("%s - %s", v3270_get_session_name(terminal), url);
 		gtk_window_set_title(GTK_WINDOW(window), title);
--
libgit2 0.21.2