diff --git a/utils/extractor.py b/utils/extractor.py
index a8e9057..3fa66c6 100644
--- a/utils/extractor.py
+++ b/utils/extractor.py
@@ -16,7 +16,7 @@ def mark_file_as_BAD(file: str, bad_exception: Exception) -> None:
         print(f'[Error] {e}')
 
 
-def extract_zip(zip_file: str, target_dir: str) -> None:
+def extract_zip(zip_file: str, target_dir: str) -> None | Exception:
     try:
         with zipfile.ZipFile(zip_file, 'r') as zip_ref:
             members = [ m for m in zip_ref.infolist() if "__MACOSX" not in m.filename ]
@@ -26,6 +26,7 @@ def extract_zip(zip_file: str, target_dir: str) -> None:
         mark_file_as_BAD(zip_file, e)
     except Exception as e:
         print(f'[ERROR] Something went wrong while extracting the contents of a submitted zip file. Check the error message, get student id and download / organise manually\nError message: {e}')
+        return e
 
 
 def extract_rar(rar_file: str, target_dir: str) -> None:
@@ -64,11 +65,11 @@ def extract_7z(seven_zip_file: str, target_dir: str) -> None:
         mark_file_as_BAD(seven_zip_file, e)
 
 
-def extract_file_to_dir(file_path: str, student_dir: str) -> None:
+def extract_file_to_dir(file_path: str, student_dir: str) -> None | Exception:
     os.makedirs(student_dir, exist_ok=True)  # create the subdirectory for student
 
     if file_path.lower().endswith('.zip'):
-        extract_zip(file_path, student_dir)
+        return extract_zip(file_path, student_dir)
     elif file_path.lower().endswith('.rar'):
         extract_rar(file_path, student_dir) 
     elif file_path.lower().endswith('.7z'):
diff --git a/utils/organiser.py b/utils/organiser.py
index f1d1371..ac1a39b 100644
--- a/utils/organiser.py
+++ b/utils/organiser.py
@@ -65,8 +65,9 @@ def organise_file_per_student(src_dir: str, dest_dir: str, file_name: str, stude
     if os.path.isfile(file_path):
         file_path_lowercase = file_path.lower()
         if file_path_lowercase.endswith('.zip') or file_path_lowercase.endswith('.rar') or file_path_lowercase.endswith('.7z'):
-            extract_file_to_dir(file_path, student_dir)  # extract the file to student directory
-            if os.path.exists(file_path):  # check if compressed file exists (or it was BAD and moved), and remove if exists
+            exception_flag = extract_file_to_dir(file_path, student_dir)  # extract the file to student directory
+            # check if compressed file exists (or it was BAD and moved), and no exception was returned from extracting - remove if both true
+            if os.path.exists(file_path) and exception_flag is None:
                 os.remove(file_path)  # delete compressed file after successful extraction
         else:
             if file_path_lowercase.endswith('.txt'):
@@ -88,6 +89,7 @@ def organise_gradebook(src_dir: str, dest_dir: str) -> None:
     """
     validate_gradebook_dir_name(src_dir)  # check if dir exists, and has files in it - exits if not
     os.makedirs(dest_dir, exist_ok=True)  # create the destination directory if it doesn't exist
+    print('\nGetting gradebook stats...')
     files_counter = get_gradebook_stats(src_dir)  # print stats about the files in gradebook and get files_counter dict to use later
     students_numbers: list[str] = []  # list to add and count unique student numbers from all files in gradebook 
     print('\nStart organising...\n')