diff --git a/popup.js b/popup.js
index 3240668..d5004d2 100644
--- a/popup.js
+++ b/popup.js
@@ -117,6 +117,10 @@ function getXHR(url) {
         document.getElementById("check").style.visibility = "collapse";
         document.getElementById("show").style.visibility = "collapse";
       }
+      if (this.status === 404) {
+        document.getElementById("result").innerHTML = "<div id='message' style='margin-top:10px;'>User does not exist on GitHub :(</div>";
+        document.getElementById("show").style.visibility = "collapse";
+      }
     };
     req.onerror = function() {
       reject(Error("Network Error"));
@@ -143,10 +147,10 @@ function initData(handle) {
         { lastSearched: handle, thumbnail: avatarUrl },
         function() {
           var res = "";
-          res += `<div id='resultHandle'>${handle}s progress:</div>`;
+          var showS = handle[handle.length - 1] !== 's';
+          res += `<div id='resultHandle'>${handle}'${showS ? 's' : ''} progress:</div>`;
           var count = (prCount > 5 ? "5" : prCount) + " / 5";
           var progress = prCount * 20;
-          // res += ``;
           res += `<div class='progress-bar'><div id='prCompleteCount'>${count}</div><div class='progress-bar--color' style='width:${progress}%'></div></div>`
           var message = getMessage(prCount);
           res += `<div id='message'>${message}</div>`;