diff --git a/buildwrapper.sh b/buildwrapper.sh
index 360fe51..f0aeb5a 100755
--- a/buildwrapper.sh
+++ b/buildwrapper.sh
@@ -98,7 +98,7 @@ echo "[+] removing server capabilities from client"
 rm staging/client/JobServ/bin/jobserv-server staging/client/JobServ/bin/jobserv-server.bat
 
 echo "[+] removing client capabilities from server"
-rm staging/client/JobServ/bin/jobserv-client staging/client/JobServ/bin/jobserv-client.bat
+rm staging/server/JobServ/bin/jobserv-client staging/server/JobServ/bin/jobserv-client.bat
 
 echo "[+] populating certificates"
 cp resources/server/server.crt staging/server/
diff --git a/src/main/java/JobServ/JobServClient.java b/src/main/java/JobServ/JobServClient.java
index a330b1d..b1839f5 100644
--- a/src/main/java/JobServ/JobServClient.java
+++ b/src/main/java/JobServ/JobServClient.java
@@ -94,7 +94,7 @@ public class JobServClient {
             // blocking network operation
             response = blockingStub.getOutput(request);
         } catch (StatusRuntimeException e) {
-            logger.log(Level.WARNING, "(API Failure) Request for output failed: %s", e.getMessage());
+            logger.log(Level.WARNING, "(API Failure) Request for output failed: " + e.getStatus());
             return "<Error connecting to API>";
         }
 
@@ -119,7 +119,7 @@ public class JobServClient {
             // blocking network operation
             response = blockingStub.newJob(request);
         } catch (StatusRuntimeException e) {
-            logger.log(Level.WARNING, "(API Failure) Request for new job failed: %s", e.getMessage());
+            logger.log(Level.WARNING, "(API Failure) Request for new job failed: " + e.getStatus());
             return -1;
         }
 
@@ -147,7 +147,7 @@ public class JobServClient {
             // blocking network operation
             response = blockingStub.getStatus(request);
         } catch (StatusRuntimeException e) {
-            logger.log(Level.WARNING, "(API Failure) Request for status failed: %s", e.getMessage());
+            logger.log(Level.WARNING, "(API Failure) Request for status failed: " + e.getStatus());
             return false;
         }
 
@@ -172,7 +172,7 @@ public class JobServClient {
             // blocking network operation
             response = blockingStub.getReturn(request);
         } catch (StatusRuntimeException e) {
-            logger.log(Level.WARNING, "(API Failure) Failed to get return code: %s", e.getMessage());
+            logger.log(Level.WARNING, "(API Failure) Failed to get return code: " + e.getStatus());
             return 278;
         }
 
@@ -196,7 +196,7 @@ public class JobServClient {
             // blocking network operation
             response = blockingStub.killJob(request);
         } catch (StatusRuntimeException e) {
-            logger.log(Level.WARNING, "(API Failure) Failed to send request: %s", e.getMessage());
+            logger.log(Level.WARNING, "(API Failure) Failed to send request: " + e.getStatus());
             return;
         }
 
diff --git a/src/main/java/JobServ/JobServServer.java b/src/main/java/JobServ/JobServServer.java
index 8af7845..6156403 100644
--- a/src/main/java/JobServ/JobServServer.java
+++ b/src/main/java/JobServ/JobServServer.java
@@ -17,6 +17,7 @@ import io.netty.handler.ssl.SslContext;
 import io.netty.handler.ssl.SslContextBuilder;
 import io.netty.handler.ssl.SslProvider;
 import javax.net.ssl.SSLException;
+import java.util.InputMismatchException;
 import java.io.File;
 import java.io.IOException;
 import java.util.logging.Logger;
@@ -104,17 +105,21 @@ public class JobServServer {
      * calls server main loop.
      */
     public static void main(String[] args) throws IOException, InterruptedException {
-        int port = 8448; // TODO: port and key/cert files should be handled by a config manager
-
-        if(args.length < 3) {
-            System.out.println("Usage: ./jobserv-server cert privatekey truststore");
+        // TODO: port and key/cert files should be handled by a config manager
+        if(args.length < 4) {
+            System.out.println("Usage: ./jobserv-server port cert privatekey truststore");
             return;
         }
 
         JobServServer server;
 
-        try{
-            server = new JobServServer(8448, args[0], args[1], args[2]);
+        try {
+            server = new JobServServer(Integer.parseInt(args[0]), args[1], args[2], args[3]);
+
+        } catch (InputMismatchException e) {
+            System.out.println("Invalid port!");
+            return;
+
         } catch (SSLException e) {
             System.out.println(e.getMessage());
             return;