diff --git a/gxmail/src/main/java/com/genexus/internet/SMTPSessionJavaMail.java b/gxmail/src/main/java/com/genexus/internet/SMTPSessionJavaMail.java
index 1dd2bda20..4e06763b8 100644
--- a/gxmail/src/main/java/com/genexus/internet/SMTPSessionJavaMail.java
+++ b/gxmail/src/main/java/com/genexus/internet/SMTPSessionJavaMail.java
@@ -232,7 +232,8 @@ public void logout(GXSMTPSession sessionInfo)
 	{
 		try
 		{
-			t.close();
+			if (t != null)
+				t.close();
 		}
 		catch (MessagingException e)
 		{