diff --git a/core/client_connections.js b/core/client_connections.js
index 796c5bf5..157d27ae 100644
--- a/core/client_connections.js
+++ b/core/client_connections.js
@@ -153,7 +153,7 @@ function addNewClient(client, clientSock) {
 
     client.log.info(
         connInfo,
-        `Client connected (${connInfo.serverName}/${connInfo.port})`
+        `Client connected on node ${nodeId} (${connInfo.serverName}/${connInfo.port})`
     );
 
     Events.emit(Events.getSystemEvents().ClientConnected, {
@@ -176,7 +176,7 @@ function removeClient(client) {
                 connectionCount: clientConnections.length,
                 nodeId: client.node,
             },
-            'Client disconnected'
+            `Client disconnected from node ${client.node}`
         );
 
         if (client.user && client.user.isValid()) {
diff --git a/core/file_transfer.js b/core/file_transfer.js
index af166d24..01eec9b8 100644
--- a/core/file_transfer.js
+++ b/core/file_transfer.js
@@ -150,7 +150,7 @@ exports.getModule = class TransferFileModule extends MenuModule {
 
                 this.client.log.info(
                     { sentFiles: sentFiles },
-                    `User "${self.client.user.username}" uploaded ${sentFiles.length} file(s)`
+                    `User "${this.client.user.username}" downloaded ${sentFiles.length} file(s)`
                 );
             }
             return cb(err);
diff --git a/core/upload.js b/core/upload.js
index beb0cc71..ec73a233 100644
--- a/core/upload.js
+++ b/core/upload.js
@@ -133,7 +133,7 @@ exports.getModule = class UploadModule extends MenuModule {
 
     getSaveState() {
         //  if no areas, we're falling back due to lack of access/areas avail to upload to
-        if (this.availAreas.length > 0) {
+        if (this.availAreas.length > 0 && this.viewControllers.options) {
             return {
                 uploadType: this.uploadType,
                 tempRecvDirectory: this.tempRecvDirectory,