diff --git a/app.py b/app.py
index a700b49..f24f802 100644
--- a/app.py
+++ b/app.py
@@ -22,8 +22,11 @@ def get_artist(path):
     :param path: The Artist to get files for
     :return: a status
     """
-    proc = process_download(path)
-    return {'status': 200, 'data': proc, 'artist': path}
+    if path:
+        proc = process_download(path)
+        return {'status': 200, 'data': proc, 'artist': path}
+    else:
+        return {'status': 501}
 
 
 if __name__ == "__main__":
diff --git a/static/js/app.js b/static/js/app.js
index e353005..12df0be 100644
--- a/static/js/app.js
+++ b/static/js/app.js
@@ -1,11 +1,19 @@
 $('#download_btn').on('click', () => {
     console.log('Clicked Download!');
     let artist = $('#search_bar').val();
-    $("#loader-wrapper").fadeIn(300);
-    $.ajax({
-        url: `/api/v1/get/${artist}`,
-    }).done(function () {
-        artist.val('');
-        $("#loader-wrapper").fadeOut(700);
-    });
+    // Prevent
+    $('#search_bar').val('');
+    console.log(artist);
+    if (artist) {
+        $("#loader-wrapper").fadeIn(300);
+        $.ajax({
+            url: `/api/v1/get/${artist}`,
+        }).done(function () {
+            $('#search_bar').val('');
+            $("#loader-wrapper").fadeOut(700);
+        });
+    } else {
+        console.log('No artist');
+    }
+
 })
\ No newline at end of file