diff --git a/main/ZmqttDiscovery.ino b/main/ZmqttDiscovery.ino
index 582425d..a41a27f 100644
--- a/main/ZmqttDiscovery.ino
+++ b/main/ZmqttDiscovery.ino
@@ -109,21 +109,21 @@ void announceDeviceTrigger(bool use_gateway_info, char* topic, char* type, char*
   sensor["automation_type"] = "trigger"; // The type of automation, must be ‘trigger’.
 
   //SET TYPE
-  if (type[0] != 0) {
+  if (type && type[0] != 0) {
     sensor["type"] = type;
   } else {
     sensor["type"] = "button_short_press";
   }
 
   //SET SUBTYPE
-  if (subtype[0] != 0) {
+  if (subtype && subtype[0] != 0) {
     sensor["subtype"] = subtype;
   } else {
     sensor["subtype"] = "turn_on";
   }
 
   /* Set The topic */
-  if (topic[0]) {
+  if (topic && topic[0]) {
     char state_topic[mqtt_topic_max_size];
 
     strcpy(state_topic, mqtt_topic);
@@ -160,7 +160,7 @@ void announceDeviceTrigger(bool use_gateway_info, char* topic, char* type, char*
     identifiers.add(deviceid);
 
     /*Set Connection */
-    if (device_id[0] != 0) {
+    if (device_id && device_id[0] != 0) {
       JsonArray connections = device.createNestedArray("connections");
       JsonArray connection_mac = connections.createNestedArray();
       connection_mac.add("mac");
@@ -168,17 +168,17 @@ void announceDeviceTrigger(bool use_gateway_info, char* topic, char* type, char*
     }
 
     //Set manufacturer
-    if (device_manufacturer[0]) {
+    if (device_manufacturer && device_manufacturer[0]) {
       device["manufacturer"] = device_manufacturer;
     }
 
     //Set name
-    if (device_name[0]) {
+    if (device_name && device_name[0]) {
       device["name"] = device_name;
     }
 
     // set The Model
-    if (device_model[0]) {
+    if (device_model && device_model[0]) {
       device["model"] = device_model;
     }