diff --git a/cmd/gpu_levelzero/ze.h b/cmd/gpu_levelzero/ze.h
index 0d0155752..327fae874 100644
--- a/cmd/gpu_levelzero/ze.h
+++ b/cmd/gpu_levelzero/ze.h
@@ -18,6 +18,7 @@
 #include <stdbool.h>
 
 #define VENDOR_ID_INTEL 0x8086
+#define TEMP_ERROR_RET_VAL -999.0
 
 void zes_set_verbosity(const int level);
 
diff --git a/cmd/gpu_levelzero/zes.c b/cmd/gpu_levelzero/zes.c
index feeaa1c38..a4593deb8 100644
--- a/cmd/gpu_levelzero/zes.c
+++ b/cmd/gpu_levelzero/zes.c
@@ -113,6 +113,9 @@ static ze_result_t enumerate_zes_devices(void)
     }
 
     zes_handles = calloc(count, sizeof(zes_device_handle_t));
+    if (zes_handles == NULL) {
+        return ZE_RESULT_ERROR_OUT_OF_HOST_MEMORY;
+    }
 
     res = zesDeviceGet(handle, &count, zes_handles);
     if (res != ZE_RESULT_SUCCESS) {
@@ -355,7 +358,7 @@ bool zes_device_bus_is_healthy(char* bdf_address, uint32_t* error)
 double zes_device_temp_max(char* bdf_address, char* sensor, uint32_t* error)
 {
     if (getenv("UNITTEST") != NULL) {
-        return -999.0;
+        return TEMP_ERROR_RET_VAL;
     }
 
     uint32_t requestedType = 0;
@@ -368,7 +371,7 @@ double zes_device_temp_max(char* bdf_address, char* sensor, uint32_t* error)
     } else {
         *error = ZE_RESULT_ERROR_INVALID_ARGUMENT;
 
-        return -999.0;
+        return TEMP_ERROR_RET_VAL;
     }
 
     print_log(LOG_DEBUG, "Fetch %s temperature for %s\n", sensor, bdf_address);
@@ -378,7 +381,7 @@ double zes_device_temp_max(char* bdf_address, char* sensor, uint32_t* error)
         if (res != ZE_RESULT_SUCCESS) {
             *error = res;
 
-            return -999.0;
+            return TEMP_ERROR_RET_VAL;
         }
     }
 
@@ -386,7 +389,7 @@ double zes_device_temp_max(char* bdf_address, char* sensor, uint32_t* error)
     if (handle == 0) {
         *error = ZE_RESULT_ERROR_UNKNOWN;
 
-        return -999.0;
+        return TEMP_ERROR_RET_VAL;
     }
 
     uint32_t count = 0;
@@ -394,7 +397,7 @@ double zes_device_temp_max(char* bdf_address, char* sensor, uint32_t* error)
     if (res != ZE_RESULT_SUCCESS || count == 0) {
         *error = res;
 
-        return -999.0;
+        return TEMP_ERROR_RET_VAL;
     }
 
     zes_temp_handle_t tempHandles[count];
@@ -402,7 +405,7 @@ double zes_device_temp_max(char* bdf_address, char* sensor, uint32_t* error)
     if (res != ZE_RESULT_SUCCESS) {
         *error = res;
 
-        return -999.0;
+        return TEMP_ERROR_RET_VAL;
     }
 
     for (uint32_t i = 0; i < count; ++i) {
@@ -412,7 +415,7 @@ double zes_device_temp_max(char* bdf_address, char* sensor, uint32_t* error)
         if (res != ZE_RESULT_SUCCESS) {
             *error = res;
 
-            return -999.0;
+            return TEMP_ERROR_RET_VAL;
         }
 
         if (props.type != requestedType) {
@@ -424,7 +427,7 @@ double zes_device_temp_max(char* bdf_address, char* sensor, uint32_t* error)
         if (res != ZE_RESULT_SUCCESS) {
             *error = res;
 
-            return -999.0;
+            return TEMP_ERROR_RET_VAL;
         }
 
         print_log(LOG_DEBUG, "> Temperature: %.1f\n", tempCelsius);
@@ -434,5 +437,5 @@ double zes_device_temp_max(char* bdf_address, char* sensor, uint32_t* error)
 
     *error = ZE_RESULT_ERROR_NOT_AVAILABLE;
 
-    return -999.0;
+    return TEMP_ERROR_RET_VAL;
 }