diff --git a/src/main/java/net/schmizz/sshj/transport/TransportImpl.java b/src/main/java/net/schmizz/sshj/transport/TransportImpl.java
index 721d9417..12a16b29 100644
--- a/src/main/java/net/schmizz/sshj/transport/TransportImpl.java
+++ b/src/main/java/net/schmizz/sshj/transport/TransportImpl.java
@@ -179,7 +179,7 @@ public final class TransportImpl
      * <p/>
      * This is not efficient but is only done once.
      *
-     * @param buffer
+     * @param buffer The buffer to read from.
      *
      * @return empty string if full ident string has not yet been received
      *
@@ -288,7 +288,7 @@ public final class TransportImpl
 
     @Override
     public String getServerVersion() {
-        return serverID == null ? serverID : serverID.substring(8);
+        return serverID == null ? null : serverID.substring(8);
     }
 
     @Override
@@ -553,13 +553,13 @@ public final class TransportImpl
     /**
      * Got an SSH_MSG_UNIMPLEMENTED, so lets see where we're at and act accordingly.
      *
-     * @param buf
+     * @param packet The 'unimplemented' packet received
      *
      * @throws TransportException
      */
-    private void gotUnimplemented(SSHPacket buf)
+    private void gotUnimplemented(SSHPacket packet)
             throws SSHException {
-        long seqNum = buf.readUInt32();
+        long seqNum = packet.readUInt32();
         log.debug("Received SSH_MSG_UNIMPLEMENTED #{}", seqNum);
         if (kexer.isKexOngoing())
             throw new TransportException("Received SSH_MSG_UNIMPLEMENTED while exchanging keys");