diff --git a/src/classlib/remote.cc b/src/classlib/remote.cc
index 0e0c391..7e1272d 100644
--- a/src/classlib/remote.cc
+++ b/src/classlib/remote.cc
@@ -984,6 +984,8 @@
 
 		int cmp_text_at(int row, int col, const char *text)
 		{
+			debug("%s(%d,%d,\"%s\")",__FUNCTION__,row,col,text);
+
 #if defined(WIN32)
 
 			struct hllapi_packet_text_at 	* query;
diff --git a/src/classlib/session.cc b/src/classlib/session.cc
index 5df99a6..49001db 100644
--- a/src/classlib/session.cc
+++ b/src/classlib/session.cc
@@ -347,15 +347,22 @@
 
 			iconv(conv2Host,NULL,NULL,NULL,NULL);	// Reset state
 
-			if(iconv(conv2Host,&inBuffer,&in,&ptr,&out) != ((size_t) -1))
+			if(iconv(conv2Host,&inBuffer,&in,&ptr,&out) == ((size_t) -1)) {
+				rc.assign(str);
+			} else {
 				rc.assign(outBuffer);
+			}
 
 			free(outBuffer);
+		} else {
+			rc.assign(str);
 		}
 #else
-		rc = str;
+		rc.assign(str);
 #endif // HAVE_ICONV
 
+		trace("%s(\"%s\")=\"%s\"",__FUNCTION__,str,rc.c_str());
+
 		return rc;
 	}
 
diff --git a/src/java/getset.cc b/src/java/getset.cc
index 81e6e1e..d389ea7 100644
--- a/src/java/getset.cc
+++ b/src/java/getset.cc
@@ -113,6 +113,8 @@ JNIEXPORT jint JNICALL Java_pw3270_terminal_cmp_1string_1at(JNIEnv *env, jobject
 
 	}
 
+	trace("cmp_string_at(%d,%d,\"%s\") = %d",(int) row, (int) col, str, (int) rc);
+
 	env->ReleaseStringUTFChars( j_str, str);
 	return rc;
 
--
libgit2 0.21.2