1 files changed, 4 insertions, 2 deletions
diff --git a/Software/Visual_Studio/Tango.Telemetry/Destinations/TelemetryMqttDestination.cs b/Software/Visual_Studio/Tango.Telemetry/Destinations/TelemetryMqttDestination.cs
index 11787c834..16b741a82 100644
--- a/Software/Visual_Studio/Tango.Telemetry/Destinations/TelemetryMqttDestination.cs
+++ b/Software/Visual_Studio/Tango.Telemetry/Destinations/TelemetryMqttDestination.cs
@@ -71,7 +71,7 @@ namespace Tango.Telemetry.Destinations
                     var factory = new MqttFactory();
                     _mqttClient = factory.CreateMqttClient();
 
-                    String exeName = Assembly.GetEntryAssembly().GetName().FullName;
+                    String exeName = Assembly.GetEntryAssembly().GetName().Name;
                     _mqttOptions = new MqttClientOptionsBuilder()
                         .WithClientId(exeName)
                         .WithTcpServer(Address, Port)
@@ -106,9 +106,11 @@ namespace Tango.Telemetry.Destinations
                        .WithRetainFlag(false)
                        .Build();
 
+                message.UserProperties = new List<MqttUserProperty>();
+
                 foreach (var prop in properties)
                 {
-                    message.UserProperties.Add(new MqttUserProperty(prop.Key, prop.Value));
+                    message.UserProperties.Add(new MqttUserProperty(prop.Key, prop.Value ?? String.Empty));
                 }