diff --git a/index.js b/index.js
index 7422273..9aa62c7 100644
--- a/index.js
+++ b/index.js
@@ -228,19 +228,21 @@ async function serveResult(request) {
   let dc = new URL(request.url).searchParams.get('decode')
   let code = 200
   let result = await callAPI(request)
-  if (result.name.includes(`undefined`)) {
+  if (result.name != undefined) {
+    result.name = result.name.replace(/\u002B/g, '%20')
+    if (dc == false) {
+    result = result
+    }
+    if (!dc || dc == true) {
+    result.name = decodeURIComponent(result.name)
+    }
+  }
+  else if (result.name = undefined) {
     result = {success:false,message:"Not found"}
   }
   if (result.success == false) {
     code = 400
   }
-  result.name = result.name.replace(/\u002B/g, '%20')
-  if (dc == false) {
-    result = result
-  }
-  if (!dc || dc == true) {
-    result.name = decodeURIComponent(result.name)
-  }
   let response = new Response(JSON.stringify(result), {
     status: code,
     headers: {