diff --git a/src/auto_archiver/modules/instagram_extractor/instagram_extractor.py b/src/auto_archiver/modules/instagram_extractor/instagram_extractor.py
index 0af2c32..7ae3b01 100644
--- a/src/auto_archiver/modules/instagram_extractor/instagram_extractor.py
+++ b/src/auto_archiver/modules/instagram_extractor/instagram_extractor.py
@@ -3,7 +3,9 @@
     highlights, and tagged posts. Authentication is required via username/password or a session file.
 
 """
-import re, os, shutil, traceback
+import re, os, shutil
+from sys import exc_info
+
 import instaloader
 from loguru import logger
 
@@ -28,19 +30,27 @@ class InstagramExtractor(Extractor):
     def setup(self) -> None:
 
         self.insta = instaloader.Instaloader(
-            download_geotags=True, download_comments=True, compress_json=False, dirname_pattern=self.download_folder, filename_pattern="{date_utc}_UTC_{target}__{typename}"
+            download_geotags=True,
+            download_comments=True,
+            compress_json=False,
+            dirname_pattern=self.download_folder,
+            filename_pattern="{date_utc}_UTC_{target}__{typename}"
         )
         try:
             self.insta.load_session_from_file(self.username, self.session_file)
-        except Exception as e:
-            logger.error(f"Unable to login from session file: {e}\n{traceback.format_exc()}")
+        except FileNotFoundError:
+            logger.info("No existing session file found - Attempting login with use and password.")
             try:
-                self.insta.login(self.username, config.instagram_self.password)
-                # TODO: wait for this issue to be fixed https://github.com/instaloader/instaloader/issues/1758
+                self.insta.login(self.username, self.password)
                 self.insta.save_session_to_file(self.session_file)
-            except Exception as e2:
-                logger.error(f"Unable to finish login (retrying from file): {e2}\n{traceback.format_exc()}")
-
+            except Exception as e:
+                logger.error(f"Failed to log in with Instaloader: {e}")
+                # TODO raise exception?
+                # raise Exception(f"Failed to log in with Instaloader: {e}")
+        except Exception as e:
+            logger.error(f"Error loading session file: {e}")
+            # TODO raise exception?
+            # raise Exception(f"Error loading session file: {e}")
 
 
     def download(self, item: Metadata) -> Metadata:
diff --git a/tests/extractors/test_instagram_extractor.py b/tests/extractors/test_instagram_extractor.py
index 7efe1b1..97549b8 100644
--- a/tests/extractors/test_instagram_extractor.py
+++ b/tests/extractors/test_instagram_extractor.py
@@ -3,19 +3,30 @@ import pytest
 from auto_archiver.modules.instagram_extractor import InstagramExtractor
 from .test_extractor_base import TestExtractorBase
 
-class TestInstagramExtractor(TestExtractorBase):
+
+@pytest.fixture
+def intsagram_extractor(setup_module):
 
     extractor_module: str = 'instagram_extractor'
-    config: dict = {}
+    config: dict = {
+        "username": "user_name",
+        "password": "password123",
+        "download_folder": "instaloader",
+        "session_file": "secrets/instaloader.session",
+    }
+    return setup_module(extractor_module, config)
 
-    @pytest.mark.parametrize("url", [
-        "https://www.instagram.com/p/",
-        "https://www.instagram.com/p/1234567890/",
-        "https://www.instagram.com/reel/1234567890/",
-        "https://www.instagram.com/username/",
-        "https://www.instagram.com/username/stories/",
-        "https://www.instagram.com/username/highlights/",
-    ])
-    def test_regex_matches(self, url):
-        # post
-        assert InstagramExtractor.valid_url.match(url)
+
+
+
+@pytest.mark.parametrize("url", [
+    "https://www.instagram.com/p/",
+    "https://www.instagram.com/p/1234567890/",
+    "https://www.instagram.com/reel/1234567890/",
+    "https://www.instagram.com/username/",
+    "https://www.instagram.com/username/stories/",
+    "https://www.instagram.com/username/highlights/",
+])
+def test_regex_matches(url, instagram_extractor):
+    # post
+    assert  instagram_extractor.valid_url.match(url)