diff --git a/src/lib3270/iocalls.c b/src/lib3270/iocalls.c
index a132a70..b0d2e04 100644
--- a/src/lib3270/iocalls.c
+++ b/src/lib3270/iocalls.c
@@ -289,8 +289,11 @@ LIB3270_EXPORT void	 lib3270_remove_poll(H3270 *session, void *id)
 
 LIB3270_EXPORT void	lib3270_set_poll_state(H3270 *session, void *id, int enabled)
 {
-	debug("%s(%d,%p,%d)",__FUNCTION__,session->sock,id,enabled);
-	set_poll_state(session, id, enabled);
+	if(id)
+	{
+		debug("%s: Polling on %d (%p) is %s",__FUNCTION__,session->sock,id,(enabled ? "enabled" : "disabled"));
+		set_poll_state(session, id, enabled);
+	}
 }
 
 LIB3270_EXPORT void	 lib3270_remove_poll_fd(H3270 *session, int fd)
@@ -582,7 +585,7 @@ int non_blocking(H3270 *hSession, Boolean on)
 	lib3270_set_poll_state(hSession,hSession->xio.write, on);
 	lib3270_set_poll_state(hSession,hSession->xio.except, on);
 
-	trace("Socket %d is %s",hSession->sock, on ? "non-blocking" : "blocking");
+	trace("******** Socket %d is %s",hSession->sock, on ? "non-blocking" : "blocking");
 
 	return 0;
 }
diff --git a/src/lib3270/linux/connect.c b/src/lib3270/linux/connect.c
index 53dc577..9b4dbd6 100644
--- a/src/lib3270/linux/connect.c
+++ b/src/lib3270/linux/connect.c
@@ -286,11 +286,13 @@ static void net_connected(H3270 *hSession, int fd unused, LIB3270_IO_FLAG flag u
 	hSession->ssl.host  = 0;
 
 #if defined(HAVE_LIBSSL)
+	debug("** SSL init %s","begins");
 	if(hSession->ssl.enabled)
 	{
 		hSession->ssl.host = 1;
 		ssl_init(hSession);
 	}
+	debug("** SSL init %s","ends");
 #endif // HAVE_LIBSSL
 
 	// set options for inline out-of-band data and keepalives
--
libgit2 0.21.2