diff --git a/ndb/src/mgmsrv/Services.cpp b/ndb/src/mgmsrv/Services.cpp
index bcc18d75b09..1a5b0592066 100644
--- a/ndb/src/mgmsrv/Services.cpp
+++ b/ndb/src/mgmsrv/Services.cpp
@@ -918,7 +918,7 @@ printNodeStatus(OutputStream *output,
     output->println("node.%d.dynamic_id: %d", nodeId, dynamicId);
     output->println("node.%d.node_group: %d", nodeId, nodeGroup);
     output->println("node.%d.connect_count: %d", nodeId, connectCount);
-    output->println("node.%d.address: %s", nodeId, address);
+    output->println("node.%d.address: %s", nodeId, address ? address : "");
   }
 
 }
diff --git a/scripts/make_binary_distribution.sh b/scripts/make_binary_distribution.sh
index 78842e7d9cf..0ab26f33c53 100644
--- a/scripts/make_binary_distribution.sh
+++ b/scripts/make_binary_distribution.sh
@@ -293,10 +293,10 @@ if [ x$NDBCLUSTER = x1 ]; then
 fi
 
 # Change the distribution to a long descriptive name
-NEW_NAME=mysql@MYSQL_SERVER_SUFFIX@-$version-$PLATFORM$SUFFIX
+NEW_NAME=mysql@MYSQL_SERVER_SUFFIX@-$version-$platform$SUFFIX
 
 # Print the platform name for build logs
-echo "PLATFORM NAME: $PLATFORM"
+echo "PLATFORM NAME: $platform"
 
 BASE2=$TMP/$NEW_NAME
 rm -rf $BASE2