diff --git a/core/MySensorsCore.cpp b/core/MySensorsCore.cpp
index 82b64d4..8e1a150 100644
--- a/core/MySensorsCore.cpp
+++ b/core/MySensorsCore.cpp
@@ -223,29 +223,35 @@ void presentNode(void)
 
 uint8_t getNodeId(void)
 {
-#if defined(MY_SENSOR_NETWORK)
-	return transportGetNodeId();
-#else
-	return 0xFF;
+	uint8_t result = VALUE_NOT_DEFINED;
+#if defined(MY_GATEWAY_FEATURE)
+	result = GATEWAY_ADDRESS;
+#elif defined(MY_SENSOR_NETWORK)
+	result = transportGetNodeId();
 #endif
+	return result;
 }
 
 uint8_t getParentNodeId(void)
 {
-#if defined(MY_SENSOR_NETWORK)
-	return transportGetParentNodeId();
-#else
-	return 0xFF;
+	uint8_t result = VALUE_NOT_DEFINED;
+#if defined(MY_GATEWAY_FEATURE)
+	result = VALUE_NOT_DEFINED;	// GW doesn't have a parent
+#elif defined(MY_SENSOR_NETWORK)
+	result = transportGetParentNodeId();
 #endif
+	return result;
 }
 
 uint8_t getDistanceGW(void)
 {
-#if defined(MY_SENSOR_NETWORK)
-	return transportGetDistanceGW();
-#else
-	return 0xFF;
+	uint8_t result = VALUE_NOT_DEFINED;
+#if defined(MY_GATEWAY_FEATURE)
+	result = 0;
+#elif defined(MY_SENSOR_NETWORK)
+	result = transportGetDistanceGW();
 #endif
+	return result;
 }
 
 controllerConfig_t getConfig(void)
diff --git a/core/MySensorsCore.h b/core/MySensorsCore.h
index 6ae969d..f0234dc 100644
--- a/core/MySensorsCore.h
+++ b/core/MySensorsCore.h
@@ -83,6 +83,7 @@
 #define MY_SLEEP_NOT_POSSIBLE	((int8_t)-2)			//!< Sleeping not possible
 #define INTERRUPT_NOT_DEFINED	((uint8_t)255)			//!< _sleep() param: no interrupt defined
 #define MODE_NOT_DEFINED		((uint8_t)255)			//!< _sleep() param: no mode defined
+#define VALUE_NOT_DEFINED		((uint8_t)255)			//!< Value not defined
 
 
 #ifdef MY_DEBUG