diff --git a/src/lib3270/ft_cut.c b/src/lib3270/ft_cut.c
index 49e21c0..92b375e 100644
--- a/src/lib3270/ft_cut.c
+++ b/src/lib3270/ft_cut.c
@@ -375,7 +375,7 @@ static void cut_control_code(H3270 *hSession)
 
 	default:
 		trace_ds(hSession,"unknown 0x%04x\n", code);
-		cut_abort(hSession,SC_ABORT_XMIT, "%s", _("Unknown FT control code from host"));
+		cut_abort(hSession,SC_ABORT_XMIT, "%s", N_("Unknown FT control code from host"));
 		break;
 	}
 }
diff --git a/src/lib3270/ft_dft.c b/src/lib3270/ft_dft.c
index db6419e..d9adb15 100644
--- a/src/lib3270/ft_dft.c
+++ b/src/lib3270/ft_dft.c
@@ -264,11 +264,13 @@ static void dft_data_insert(H3270 *hSession, struct data_buffer *data_bufr)
 
 		/* If transfer completed ok, use our msg. */
 		if (memcmp(msgp, END_TRANSFER, strlen(END_TRANSFER)) == 0) {
+			trace_ds(hSession,"END_TRANSFER\n");
+			ft_complete(hSession->ft,(const char *) msgp);
 			lib3270_free(msgp);
-			ft_complete(hSession->ft,NULL);
 		}
 		else if (lib3270_get_ft_state(hSession) == FT_ABORT_SENT && ((H3270FT *) hSession->ft)->abort_string != CN)
 		{
+			trace_ds(hSession,"ABORT_TRANSFER [%s]\n",msgp);
 			lib3270_free(msgp);
 			ft_failed(ft,ft->abort_string);
 			lib3270_free(ft->abort_string);
--
libgit2 0.21.2