diff --git a/client/X11/xf_rail.c b/client/X11/xf_rail.c
index ccfe6b0c0..fefaf63c1 100644
--- a/client/X11/xf_rail.c
+++ b/client/X11/xf_rail.c
@@ -470,7 +470,8 @@ static BOOL xf_rail_window_common(rdpContext* context, WINDOW_ORDER_INFO* orderI
 
 	if (fieldFlags & WINDOW_ORDER_FIELD_TITLE)
 	{
-		xf_SetWindowText(xfc, appWindow, appWindow->title);
+		if (appWindow->title)
+			xf_SetWindowText(xfc, appWindow, appWindow->title);
 	}
 
 	if ((fieldFlags & WINDOW_ORDER_FIELD_WND_OFFSET) ||
diff --git a/libfreerdp/core/peer.c b/libfreerdp/core/peer.c
index 38f2218e1..bbde82a65 100644
--- a/libfreerdp/core/peer.c
+++ b/libfreerdp/core/peer.c
@@ -222,7 +222,7 @@ static BOOL freerdp_peer_initialize(freerdp_peer* client)
 
 		if (!settings->RdpServerRsaKey)
 		{
-			WLog_ERR(TAG, "inavlid RDP key file %s", settings->RdpKeyFile);
+			WLog_ERR(TAG, "invalid RDP key file %s", settings->RdpKeyFile);
 			return FALSE;
 		}
 	}