diff --git a/src/Terminal.jsx b/src/Terminal.jsx
index 91a670390..46085d14a 100644
--- a/src/Terminal.jsx
+++ b/src/Terminal.jsx
@@ -575,47 +575,26 @@ let Terminal = {
             let currServ = Player.getCurrentServer();
             const isHacknet = currServ instanceof HacknetServer;
             post(currServ.hostname + ": ");
-            post("Organization name: " + currServ.organizationName);
-            var rootAccess = "";
-            if (currServ.hasAdminRights) {rootAccess = "YES";}
-            else {rootAccess = "NO";}
-            post("Root Access: " + rootAccess);
-            if (!isHacknet) { post("Required hacking skill: " + currServ.requiredHackingSkill); }
-            post("Server security level: " + numeralWrapper.formatServerSecurity(currServ.hackDifficulty));
-            post("Chance to hack: " + numeralWrapper.formatPercentage(calculateHackingChance(currServ, Player)));
-            post("Time to hack: " + convertTimeMsToTimeElapsedString(calculateHackingTime(currServ, Player)*1000, true));
-            postElement(<>Total money available on server: {Money(currServ.moneyAvailable)}</>);
-            if (!isHacknet) { post("Required number of open ports for NUKE: " + currServ.numOpenPortsRequired); }
-
-            if (currServ.sshPortOpen) {
-                post("SSH port: Open")
-            } else {
-                post("SSH port: Closed")
-            }
-
-            if (currServ.ftpPortOpen) {
-                post("FTP port: Open")
-            } else {
-                post("FTP port: Closed")
-            }
-
-            if (currServ.smtpPortOpen) {
-                post("SMTP port: Open")
-            } else {
-                post("SMTP port: Closed")
-            }
-
-            if (currServ.httpPortOpen) {
-                post("HTTP port: Open")
-            } else {
-                post("HTTP port: Closed")
-            }
-
-            if (currServ.sqlPortOpen) {
-                post("SQL port: Open")
-            } else {
-                post("SQL port: Closed")
-            }
+            const org = currServ.organizationName
+            post("Organization name: " + (!isHacknet ? org : "Player"));
+            const admin = currServ.hasAdminRights;
+            post("Root Access: " + (!isHacknet ? "YES" : "NO"));
+            const hackingSkill = currServ.requiredHackingSkill
+            post("Required hacking skill: " + (!isHacknet ? hackingSkill : "N/A"));
+            const security = currServ.hackDifficulty;
+            post("Server security level: " + (!isHacknet ? numeralWrapper.formatServerSecurity(security) : "N/A"));
+            const hackingChance = calculateHackingChance(currServ, Player)
+            post("Chance to hack: " + (!isHacknet ? numeralWrapper.formatPercentage(hackingChance) : "N/A"));
+            const hackingTime = calculateHackingTime(currServ, Player)*1000;
+            post("Time to hack: " + (!isHacknet ? convertTimeMsToTimeElapsedString(hackingTime, true) : "N/A"));
+            postElement(<>Total money available on server: {!isHacknet ? Money(currServ.moneyAvailable) : "N/A"}</>);
+            const numPort = currServ.numOpenPortsRequired;
+            post("Required number of open ports for NUKE: " + (!isHacknet ? numPort : "N/A"));
+            post("SSH port: "+ (currServ.sshPortOpen ? "Open" : "Closed"))
+            post("FTP port: "+ (currServ.ftpPortOpen ? "Open" : "Closed"))
+            post("SMTP port: "+ (currServ.smtpPortOpen ? "Open" : "Closed"))
+            post("HTTP port: "+ (currServ.httpPortOpen ? "Open" : "Closed"))
+            post("SQL port: "+ (currServ.sqlPortOpen ? "Open" : "Closed"))
         }
         Terminal.analyzeFlag = false;
     },
@@ -2149,6 +2128,12 @@ let Terminal = {
                 post("Invalid server IP/hostname");
                 return;
             }
+
+            if(targetServer instanceof HacknetServer) {
+                post(`${Programs.ServerProfiler.name} cannot be run on a Hacknet Server.`);
+                return
+            }
+
             post(targetServer.hostname + ":");
             post("Server base security level: " + targetServer.baseDifficulty);
             post("Server current security level: " + targetServer.hackDifficulty);