diff --git a/node_exporter_manager.py b/node_exporter_manager.py
index ef8f6b2..10cbd35 100644
--- a/node_exporter_manager.py
+++ b/node_exporter_manager.py
@@ -63,6 +63,9 @@ def download_and_extract(url, download_path='/tmp'):
     import sys
 
     filename = os.path.join(download_path, url.split('/')[-1])
+    extract_dirname = filename.replace('.tar.gz', '')
+    extract_path = Path(extract_dirname)
+
     try:
         with requests.get(url, stream=True, timeout=30) as r:
             r.raise_for_status()
@@ -79,7 +82,11 @@ def download_and_extract(url, download_path='/tmp'):
         else:
             tar.extractall(path=download_path)
 
-    return next(Path(download_path).glob('node_exporter-*'))
+    if not extract_path.is_dir():
+        raise Exception(f"Nie znaleziono rozpakowanego katalogu: {extract_path}")
+
+    return extract_path
+
 
 # ----------------- INSTALACJA I KONFIGURACJA -----------------