diff --git a/src/main/java/com/comandante/creeper/Main.java b/src/main/java/com/comandante/creeper/Main.java
index 9b1707c74d5ef4bd9fe7271e1b9bc86d46b670e4..fb7e1ef2b1c39a8ddeeb9d79971baf272566f2de 100644
--- a/src/main/java/com/comandante/creeper/Main.java
+++ b/src/main/java/com/comandante/creeper/Main.java
@@ -50,13 +50,15 @@ public class Main {
             return "0";
         }
         String buildVersion = props.getProperty("build.version");
-        long buildTimestamp = Long.parseLong(props.getProperty("build.timestamp"));
+        String timestampString = props.getProperty("build.timestamp");
+        if (buildVersion == null || timestampString == null || timestampString.isEmpty() || buildVersion.isEmpty()) {
+            return "creeper-local-dev";
+        }
+        long buildTimestamp = Long.parseLong(timestampString);
         Date date = new Date(buildTimestamp);
         SimpleDateFormat format = new SimpleDateFormat();
         String dateFormatted = format.format(date);
-        if (buildVersion == null) {
-            return "creeper-local-dev";
-        }
+
         return buildVersion + " " + dateFormatted;
     }
     public static void main(String[] args) throws Exception {
diff --git a/src/main/java/com/comandante/creeper/command/admin/SystemInfo.java b/src/main/java/com/comandante/creeper/command/admin/SystemInfo.java
index 72fc123f087173ff4005162d4b069806896b4708..a19ee260d783340ec6aff12a8326e8d2519efa69 100644
--- a/src/main/java/com/comandante/creeper/command/admin/SystemInfo.java
+++ b/src/main/java/com/comandante/creeper/command/admin/SystemInfo.java
@@ -45,27 +45,27 @@ public class SystemInfo extends Command {
                     .append("os_name:")
                     .append(Color.RESET)
                     .append(os_name)
-                    .append(" | ")
+                    .append("\r\n")
                     .append(Color.MAGENTA)
-                    .append(" os_version:")
+                    .append("os_version:")
                     .append(Color.RESET)
                     .append(os_version)
-                    .append(" | ")
+                    .append("\r\n")
                     .append(Color.MAGENTA)
                     .append("java_version:")
                     .append(Color.RESET)
                     .append(java_version)
-                    .append(" | ")
+                    .append("\r\n")
                     .append(Color.MAGENTA)
                     .append("max_heap:")
                     .append(Color.RESET)
                     .append(maxHeap)
-                    .append(" | ")
+                    .append("\r\n")
                     .append(Color.MAGENTA)
                     .append("uptime:")
                     .append(Color.RESET)
                     .append(upTime)
-                    .append(" | ")
+                    .append("\r\n")
                     .append(Color.MAGENTA)
                     .append("build:")
                     .append(Color.RESET)