diff --git a/deemix/__main__.py b/deemix/__main__.py
index bb1e954..ae5ce1b 100644
--- a/deemix/__main__.py
+++ b/deemix/__main__.py
@@ -13,12 +13,12 @@ from os.path import isfile
 def download(bitrate, local, url):
     settings = initSettings(local)
     app.login()
+    url = list(url)
     if isfile(url[0]):
         filename = url[0]
         with open(filename) as f:
             url = f.readlines()
-    for u in url:
-        app.downloadLink(u, settings, bitrate)
+    app.downloadLink(url, settings, bitrate)
     click.echo("All done!")
     if local:
         click.echo(settings['downloadLocation']) #folder name output
diff --git a/deemix/app/cli.py b/deemix/app/cli.py
index a094ac2..fdf34b5 100644
--- a/deemix/app/cli.py
+++ b/deemix/app/cli.py
@@ -35,5 +35,4 @@ def login():
 
 
 def downloadLink(url, settings, bitrate=None):
-    url = url.strip()
     addToQueue(dz, sp, url, settings, bitrate)
diff --git a/deemix/app/queuemanager.py b/deemix/app/queuemanager.py
index d4222b7..2384b45 100644
--- a/deemix/app/queuemanager.py
+++ b/deemix/app/queuemanager.py
@@ -62,6 +62,7 @@ def generateQueueItem(dz, sp, url, settings, bitrate=None, albumAPI=None, interf
     type = getTypeFromLink(url)
     id = getIDFromLink(url, type)
     result = {}
+    result['link'] = url
     if type == None or id == None:
         logger.warn("URL not recognized")
         result['error'] = "URL not recognized"
@@ -254,6 +255,9 @@ def addToQueue(dz, sp, url, settings, bitrate=None, interface=None):
     if type(url) is list:
         queueItem = []
         for link in url:
+            link = link.strip()
+            if link == "":
+                continue
             logger.info("Generating queue item for: "+link)
             item = generateQueueItem(dz, sp, link, settings, bitrate, interface=interface)
             if type(item) is list:
@@ -261,12 +265,15 @@ def addToQueue(dz, sp, url, settings, bitrate=None, interface=None):
             else:
                 queueItem.append(item)
     else:
+        url = url.strip()
+        if url == "":
+            return False
         logger.info("Generating queue item for: "+url)
         queueItem = generateQueueItem(dz, sp, url, settings, bitrate, interface=interface)
     if type(queueItem) is list:
         for x in queueItem:
             if 'error' in x:
-                logger.error(f"[{url}] {x['error']}")
+                logger.error(f"[{x['link']}] {x['error']}")
                 continue
             if x['uuid'] in list(queueList.keys()):
                 logger.warn(f"[{x['uuid']}] Already in queue, will not be added again.")
@@ -278,7 +285,7 @@ def addToQueue(dz, sp, url, settings, bitrate=None, interface=None):
             logger.info(f"[{x['uuid']}] Added to queue.")
     else:
         if 'error' in queueItem:
-            logger.error(f"[{url}] {queueItem['error']}")
+            logger.error(f"[{queueItem['link']}] {queueItem['error']}")
             if interface:
                 interface.send("errorMessage", queueItem['error'])
             return False
diff --git a/setup.py b/setup.py
index cd869b1..43c9780 100644
--- a/setup.py
+++ b/setup.py
@@ -7,7 +7,7 @@ README = (HERE / "README.md").read_text()
 
 setup(
     name="deemix",
-    version="1.0.23",
+    version="1.0.24",
     description="A barebone deezer downloader library",
     long_description=README,
     long_description_content_type="text/markdown",