diff --git a/unified-runtime/source/adapters/level_zero/image_common.cpp b/unified-runtime/source/adapters/level_zero/image_common.cpp
index e4cbd8edbe9a8..fffaa7af57bfa 100644
--- a/unified-runtime/source/adapters/level_zero/image_common.cpp
+++ b/unified-runtime/source/adapters/level_zero/image_common.cpp
@@ -172,6 +172,13 @@ ur_result_t ze2urImageFormat(const ze_image_format_t &ZeImageFormat,
       ChannelType = UR_IMAGE_CHANNEL_TYPE_UNSIGNED_INT16;
     } else if (ZeImageFormatTypeSize == 32) {
       ChannelType = UR_IMAGE_CHANNEL_TYPE_UNSIGNED_INT32;
+    } else {
+      UR_LOG(
+          ERR,
+          "ze2urImageFormat: unexpected image format type size for UINT: size "
+          "= {}",
+          ZeImageFormatTypeSize);
+      return UR_RESULT_ERROR_INVALID_VALUE;
     }
     break;
   case ZE_IMAGE_FORMAT_TYPE_SINT:
@@ -181,6 +188,13 @@ ur_result_t ze2urImageFormat(const ze_image_format_t &ZeImageFormat,
       ChannelType = UR_IMAGE_CHANNEL_TYPE_SIGNED_INT16;
     } else if (ZeImageFormatTypeSize == 32) {
       ChannelType = UR_IMAGE_CHANNEL_TYPE_SIGNED_INT32;
+    } else {
+      UR_LOG(
+          ERR,
+          "ze2urImageFormat: unexpected image format type size for SINT: size "
+          "= {}",
+          ZeImageFormatTypeSize);
+      return UR_RESULT_ERROR_INVALID_VALUE;
     }
     break;
   case ZE_IMAGE_FORMAT_TYPE_UNORM:
diff --git a/unified-runtime/source/adapters/level_zero/kernel.cpp b/unified-runtime/source/adapters/level_zero/kernel.cpp
index b6d3d2e64ce4e..45b7b087cece5 100644
--- a/unified-runtime/source/adapters/level_zero/kernel.cpp
+++ b/unified-runtime/source/adapters/level_zero/kernel.cpp
@@ -867,7 +867,7 @@ ur_result_t urKernelSuggestMaxCooperativeGroupCount(
   (void)dynamicSharedMemorySize;
   std::shared_lock<ur_shared_mutex> Guard(hKernel->Mutex);
 
-  ze_kernel_handle_t ZeKernel;
+  ze_kernel_handle_t ZeKernel = nullptr;
   UR_CALL(getZeKernel(hDevice->ZeDevice, hKernel, &ZeKernel));
 
   uint32_t WG[3];