diff --git a/src/engine/io/file_manager.rs b/src/engine/io/file_manager.rs
index 02909f2..8ba84d7 100644
--- a/src/engine/io/file_manager.rs
+++ b/src/engine/io/file_manager.rs
@@ -116,7 +116,7 @@ impl FileManager {
 
 impl Drop for FileManager {
     fn drop(&mut self) {
-        if !self.request_queue.is_closed() {
+        if self.request_queue.is_closed() {
             return;
         }
         error!("File Manager wasn't shutdown cleanly! This is a bug, please report!");
diff --git a/src/engine/io/file_manager/file_executor.rs b/src/engine/io/file_manager/file_executor.rs
index 14d4d83..cf81e99 100644
--- a/src/engine/io/file_manager/file_executor.rs
+++ b/src/engine/io/file_manager/file_executor.rs
@@ -6,6 +6,7 @@ use crate::constants::PAGE_SIZE;
 use crate::engine::io::file_manager::ResourceFormatter;
 use crate::engine::io::page_formats::{PageId, PageOffset};
 use bytes::{Bytes, BytesMut};
+use futures::SinkExt;
 use lru::LruCache;
 use std::collections::{HashMap, VecDeque};
 use std::convert::TryFrom;
@@ -112,7 +113,7 @@ impl FileExecutor {
                     if let Some(sender) = shut_sender {
                         shutdown_sender = Some(sender);
                         self.receive_queue.close();
-                        info!("Got shutdown request");
+                        debug!("File Executor: Got shutdown request");
                     } else {}
                 }
                 recv_completed = receive_completed.recv() => {
@@ -125,9 +126,7 @@ impl FileExecutor {
                                 file_handles_open = file_handles_open.saturating_sub(1);
                             }
                         }
-                    } else {
-                        break;
-                    }
+                    } else {}
                 }
                 maybe_recv = self.receive_queue.recv(), if request_queue.len() < MAX_FILE_HANDLE_COUNT => {
                     if let Some((page_id, req_type)) = maybe_recv {
diff --git a/src/feophant.rs b/src/feophant.rs
index 66834a7..fc3ba4f 100644
--- a/src/feophant.rs
+++ b/src/feophant.rs
@@ -106,7 +106,7 @@ impl FeOphant {
 
         //Clean up
         match self.file_manager.shutdown().await {
-            Ok(_) => {}
+            Ok(_) => info!("File Manager shutdown!"),
             Err(e) => error!("Had an error shutting down I/O {0}", e),
         }