diff --git a/spring-integration-ftp/src/main/java/org/springframework/integration/ftp/session/FtpSession.java b/spring-integration-ftp/src/main/java/org/springframework/integration/ftp/session/FtpSession.java
index 1f907a87dc..cb5f7848a4 100644
--- a/spring-integration-ftp/src/main/java/org/springframework/integration/ftp/session/FtpSession.java
+++ b/spring-integration-ftp/src/main/java/org/springframework/integration/ftp/session/FtpSession.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2019 the original author or authors.
+ * Copyright 2002-2020 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -152,16 +152,21 @@ public class FtpSession implements Session<FTPFile> {
 	@Override
 	public void close() {
 		try {
-			if (this.readingRaw.get() && !finalizeRaw() && LOGGER.isWarnEnabled()) {
-				LOGGER.warn("Finalize on readRaw() returned false for " + this);
+			if (this.readingRaw.get() && !finalizeRaw() && LOGGER.isDebugEnabled()) {
+				LOGGER.debug("Finalize on readRaw() returned false for " + this);
 			}
-			if (this.client.isConnected()) {
-				this.client.logout();
+			if (isOpen()) {
+				try {
+					this.client.logout();
+				}
+				catch (IOException ex) {
+					LOGGER.debug("failed to logout FTPClient", ex);
+				}
 			}
 			this.client.disconnect();
 		}
-		catch (Exception e) {
-			LOGGER.warn("failed to disconnect FTPClient", e);
+		catch (Exception ex) {
+			LOGGER.debug("failed to disconnect FTPClient", ex);
 		}
 	}
 
@@ -170,7 +175,8 @@ public class FtpSession implements Session<FTPFile> {
 		try {
 			this.client.noop();
 		}
-		catch (Exception e) {
+		catch (Exception ex) {
+			LOGGER.debug("failed to noop FTPClient", ex);
 			return false;
 		}
 		return true;
diff --git a/spring-integration-ftp/src/test/java/org/springframework/integration/ftp/session/SessionFactoryTests.java b/spring-integration-ftp/src/test/java/org/springframework/integration/ftp/session/SessionFactoryTests.java
index 06b98adb6a..057fdd25c3 100644
--- a/spring-integration-ftp/src/test/java/org/springframework/integration/ftp/session/SessionFactoryTests.java
+++ b/spring-integration-ftp/src/test/java/org/springframework/integration/ftp/session/SessionFactoryTests.java
@@ -21,7 +21,9 @@ import static org.assertj.core.api.Assertions.assertThatExceptionOfType;
 import static org.assertj.core.api.Assertions.assertThatIllegalArgumentException;
 import static org.assertj.core.api.Assertions.fail;
 import static org.mockito.Mockito.doReturn;
+import static org.mockito.Mockito.doThrow;
 import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.times;
 import static org.mockito.Mockito.verify;
 
 import java.lang.reflect.Field;
@@ -69,7 +71,6 @@ class SessionFactoryTests {
 		sessionFactory.setDataTimeout(789);
 		doReturn(200).when(client).getReplyCode();
 		doReturn(true).when(client).login("foo", null);
-		doReturn(true).when(client).isConnected();
 		FtpSession session = sessionFactory.getSession();
 		verify(client).setConnectTimeout(123);
 		verify(client).setDefaultTimeout(456);
@@ -79,6 +80,13 @@ class SessionFactoryTests {
 
 		verify(client).logout();
 		verify(client).disconnect();
+
+		doThrow(RuntimeException.class).when(client).noop();
+
+		session.close();
+
+		verify(client).logout();
+		verify(client, times(2)).disconnect();
 	}
 
 	@Test