diff --git a/unified-runtime/source/adapters/opencl/common.cpp b/unified-runtime/source/adapters/opencl/common.cpp
index 5047e61ab9355..e51d2ac6af2e7 100644
--- a/unified-runtime/source/adapters/opencl/common.cpp
+++ b/unified-runtime/source/adapters/opencl/common.cpp
@@ -46,6 +46,7 @@ ur_result_t mapCLErrorToUR(cl_int Result) {
   case CL_INVALID_PROGRAM_EXECUTABLE:
     return UR_RESULT_ERROR_INVALID_PROGRAM_EXECUTABLE;
   case CL_INVALID_KERNEL_NAME:
+  case CL_INVALID_KERNEL_DEFINITION:
     return UR_RESULT_ERROR_INVALID_KERNEL_NAME;
   case CL_BUILD_PROGRAM_FAILURE:
     return UR_RESULT_ERROR_PROGRAM_BUILD_FAILURE;
@@ -93,6 +94,8 @@ ur_result_t mapCLErrorToUR(cl_int Result) {
     return UR_RESULT_ERROR_INVALID_KERNEL_ARGUMENT_SIZE;
   case CL_INVALID_SPEC_ID:
     return UR_RESULT_ERROR_INVALID_SPEC_ID;
+  case CL_INVALID_KERNEL:
+    return UR_RESULT_ERROR_INVALID_KERNEL;
   default:
     return UR_RESULT_ERROR_UNKNOWN;
   }