diff --git a/runtime/sharings/d3d/d3d_sharing.cpp b/runtime/sharings/d3d/d3d_sharing.cpp
index 09f94bfc19..9943ed58e2 100644
--- a/runtime/sharings/d3d/d3d_sharing.cpp
+++ b/runtime/sharings/d3d/d3d_sharing.cpp
@@ -55,7 +55,7 @@ D3DSharing<D3D>::~D3DSharing() {
 };
 
 template <typename D3D>
-void D3DSharing<D3D>::synchronizeObject(UpdateData *updateData) {
+void D3DSharing<D3D>::synchronizeObject(UpdateData &updateData) {
     void *sharedHandle = nullptr;
 
     sharingFunctions->getDeviceContext(d3dQuery);
@@ -67,7 +67,7 @@ void D3DSharing<D3D>::synchronizeObject(UpdateData *updateData) {
     }
     sharingFunctions->releaseDeviceContext(d3dQuery);
 
-    updateData->synchronizationStatus = SynchronizeStatus::ACQUIRE_SUCCESFUL;
+    updateData.synchronizationStatus = SynchronizeStatus::ACQUIRE_SUCCESFUL;
 }
 
 template <typename D3D>
diff --git a/runtime/sharings/d3d/d3d_sharing.h b/runtime/sharings/d3d/d3d_sharing.h
index 4d830fa530..2aa12f3a8e 100644
--- a/runtime/sharings/d3d/d3d_sharing.h
+++ b/runtime/sharings/d3d/d3d_sharing.h
@@ -42,7 +42,7 @@ class D3DSharing : public SharingHandler {
 
     ~D3DSharing() override;
 
-    void synchronizeObject(UpdateData *updateData) override;
+    void synchronizeObject(UpdateData &updateData) override;
     void releaseResource(MemObj *memObject) override;
 
     D3DResource **getResourceHandler() { return &resource; }
diff --git a/runtime/sharings/d3d/d3d_surface.cpp b/runtime/sharings/d3d/d3d_surface.cpp
index a61aa3a30d..ca5a03eb8e 100644
--- a/runtime/sharings/d3d/d3d_surface.cpp
+++ b/runtime/sharings/d3d/d3d_surface.cpp
@@ -115,7 +115,7 @@ Image *D3DSurface::create(Context *context, cl_dx9_surface_info_khr *surfaceInfo
     return Image::createSharedImage(context, surface, mcsSurfaceInfo, alloc, nullptr, flags, imgInfo, __GMM_NO_CUBE_MAP, 0, 0);
 }
 
-void D3DSurface::synchronizeObject(UpdateData *updateData) {
+void D3DSurface::synchronizeObject(UpdateData &updateData) {
     D3DLOCKED_RECT lockedRect = {};
     sharingFunctions->setDevice(resourceDevice);
     if (sharedResource && !context->getInteropUserSyncEnabled()) {
@@ -128,7 +128,7 @@ void D3DSurface::synchronizeObject(UpdateData *updateData) {
             sharingFunctions->lockRect(d3d9SurfaceStaging, &lockedRect, D3DLOCK_READONLY);
         }
 
-        auto image = castToObjectOrAbort<Image>(updateData->memObject);
+        auto image = castToObjectOrAbort<Image>(updateData.memObject);
         auto sys = lockedRect.pBits;
         auto gpu = context->getMemoryManager()->lockResource(image->getGraphicsAllocation());
         auto pitch = static_cast<ULONG>(lockedRect.Pitch);
@@ -136,7 +136,7 @@ void D3DSurface::synchronizeObject(UpdateData *updateData) {
 
         image->getGraphicsAllocation()->gmm->resourceCopyBlt(sys, gpu, pitch, height, 1u, oclPlane);
 
-        context->getMemoryManager()->unlockResource(updateData->memObject->getGraphicsAllocation());
+        context->getMemoryManager()->unlockResource(updateData.memObject->getGraphicsAllocation());
 
         if (lockable) {
             sharingFunctions->unlockRect(d3d9Surface);
@@ -146,7 +146,7 @@ void D3DSurface::synchronizeObject(UpdateData *updateData) {
 
         sharingFunctions->flushAndWait(d3dQuery);
     }
-    updateData->synchronizationStatus = SynchronizeStatus::ACQUIRE_SUCCESFUL;
+    updateData.synchronizationStatus = SynchronizeStatus::ACQUIRE_SUCCESFUL;
 }
 
 void D3DSurface::releaseResource(MemObj *memObject) {
@@ -314,9 +314,8 @@ cl_int D3DSurface::findImgFormat(D3DFORMAT d3dFormat, cl_image_format &imgFormat
     return CL_SUCCESS;
 }
 
-int D3DSurface::validateUpdateData(UpdateData *updateData) {
-    UNRECOVERABLE_IF(updateData == nullptr);
-    auto image = castToObject<Image>(updateData->memObject);
+int D3DSurface::validateUpdateData(UpdateData &updateData) {
+    auto image = castToObject<Image>(updateData.memObject);
     if (!image) {
         return CL_INVALID_MEM_OBJECT;
     }
diff --git a/runtime/sharings/d3d/d3d_surface.h b/runtime/sharings/d3d/d3d_surface.h
index def276229f..8579912fc0 100644
--- a/runtime/sharings/d3d/d3d_surface.h
+++ b/runtime/sharings/d3d/d3d_surface.h
@@ -39,9 +39,9 @@ class D3DSurface : public D3DSharing<D3DTypesHelper::D3D9> {
     static Image *create(Context *context, cl_dx9_surface_info_khr *surfaceInfo, cl_mem_flags flags,
                          cl_dx9_media_adapter_type_khr adapterType, cl_uint plane, cl_int *retCode);
     static cl_int findImgFormat(D3DFORMAT d3dFormat, cl_image_format &imgFormat, cl_uint plane, OCLPlane &oclPlane);
-    void synchronizeObject(UpdateData *updateData) override;
+    void synchronizeObject(UpdateData &updateData) override;
     void releaseResource(MemObj *memObject) override;
-    int validateUpdateData(UpdateData *updateData) override;
+    int validateUpdateData(UpdateData &updateData) override;
 
     cl_dx9_surface_info_khr &getSurfaceInfo() { return surfaceInfo; }
     cl_dx9_media_adapter_type_khr &getAdapterType() { return adapterType; }
diff --git a/runtime/sharings/sharing.cpp b/runtime/sharings/sharing.cpp
index e9b7f6e2ab..7d2546d495 100644
--- a/runtime/sharings/sharing.cpp
+++ b/runtime/sharings/sharing.cpp
@@ -33,7 +33,7 @@ int SharingHandler::acquire(MemObj *memObj) {
         auto currentSharedHandle = memObj->getGraphicsAllocation()->peekSharedHandle();
         updateData.sharedHandle = currentSharedHandle;
         updateData.memObject = memObj;
-        int result = synchronizeHandler(&updateData);
+        int result = synchronizeHandler(updateData);
         resolveGraphicsAllocationChange(currentSharedHandle, &updateData);
         if (result != CL_SUCCESS) {
             return result;
@@ -48,7 +48,7 @@ int SharingHandler::acquire(MemObj *memObj) {
     return CL_SUCCESS;
 }
 
-int SharingHandler::synchronizeHandler(UpdateData *updateData) {
+int SharingHandler::synchronizeHandler(UpdateData &updateData) {
     auto result = validateUpdateData(updateData);
     if (result == CL_SUCCESS) {
         synchronizeObject(updateData);
@@ -56,8 +56,7 @@ int SharingHandler::synchronizeHandler(UpdateData *updateData) {
     return result;
 }
 
-int SharingHandler::validateUpdateData(UpdateData *updateData) {
-    UNRECOVERABLE_IF(updateData == nullptr);
+int SharingHandler::validateUpdateData(UpdateData &updateData) {
     return CL_SUCCESS;
 }
 
diff --git a/runtime/sharings/sharing.h b/runtime/sharings/sharing.h
index 821ea66722..a37eb3f805 100644
--- a/runtime/sharings/sharing.h
+++ b/runtime/sharings/sharing.h
@@ -58,9 +58,9 @@ class SharingHandler {
     virtual void releaseReusedGraphicsAllocation(){};
 
   protected:
-    virtual int synchronizeHandler(UpdateData *updateData);
-    virtual int validateUpdateData(UpdateData *updateData);
-    virtual void synchronizeObject(UpdateData *updateData) { updateData->synchronizationStatus = SYNCHRONIZE_ERROR; }
+    virtual int synchronizeHandler(UpdateData &updateData);
+    virtual int validateUpdateData(UpdateData &updateData);
+    virtual void synchronizeObject(UpdateData &updateData) { updateData.synchronizationStatus = SYNCHRONIZE_ERROR; }
     virtual void resolveGraphicsAllocationChange(osHandle currentSharedHandle, UpdateData *updateData);
     virtual void releaseResource(MemObj *memObject){};
     unsigned int acquireCount = 0u;
diff --git a/runtime/sharings/va/va_surface.cpp b/runtime/sharings/va/va_surface.cpp
index 40e561b8fb..b83da48dec 100644
--- a/runtime/sharings/va/va_surface.cpp
+++ b/runtime/sharings/va/va_surface.cpp
@@ -99,11 +99,11 @@ Image *VASurface::createSharedVaSurface(Context *context, VASharingFunctions *sh
     return image;
 }
 
-void VASurface::synchronizeObject(UpdateData *updateData) {
+void VASurface::synchronizeObject(UpdateData &updateData) {
     if (!interopUserSync) {
         sharingFunctions->syncSurface(*surfaceId);
     }
-    updateData->synchronizationStatus = SynchronizeStatus::ACQUIRE_SUCCESFUL;
+    updateData.synchronizationStatus = SynchronizeStatus::ACQUIRE_SUCCESFUL;
 }
 
 void VASurface::getMemObjectInfo(size_t &paramValueSize, void *&paramValue) {
diff --git a/runtime/sharings/va/va_surface.h b/runtime/sharings/va/va_surface.h
index eef47a7145..8714ce9e2d 100644
--- a/runtime/sharings/va/va_surface.h
+++ b/runtime/sharings/va/va_surface.h
@@ -34,7 +34,7 @@ class VASurface : VASharing {
                                         cl_mem_flags flags, VASurfaceID *surface, cl_uint plane,
                                         cl_int *errcodeRet);
 
-    void synchronizeObject(UpdateData *updateData) override;
+    void synchronizeObject(UpdateData &updateData) override;
 
     void getMemObjectInfo(size_t &paramValueSize, void *&paramValue) override;
 
diff --git a/unit_tests/command_queue/command_queue_tests.cpp b/unit_tests/command_queue/command_queue_tests.cpp
index d2f50a4a61..7a595fc457 100644
--- a/unit_tests/command_queue/command_queue_tests.cpp
+++ b/unit_tests/command_queue/command_queue_tests.cpp
@@ -758,8 +758,8 @@ TEST(CommandQueue, givenEnqueueAcquireSharedObjectsWhenNoObjectsThenReturnSucces
 
 class MockSharingHandler : public SharingHandler {
   public:
-    void synchronizeObject(UpdateData *updateData) override {
-        updateData->synchronizationStatus = ACQUIRE_SUCCESFUL;
+    void synchronizeObject(UpdateData &updateData) override {
+        updateData.synchronizationStatus = ACQUIRE_SUCCESFUL;
     }
 };
 
@@ -902,7 +902,7 @@ TEST(CommandQueue, givenEnqueueReleaseSharedObjectsWhenIncorrectArgumentsThenRet
 
 TEST(CommandQueue, givenEnqueueAcquireSharedObjectsCallWhenAcquireFailsThenCorrectErrorIsReturned) {
     class MockSharingHandler : public SharingHandler {
-        int validateUpdateData(UpdateData *data) override {
+        int validateUpdateData(UpdateData &data) override {
             return CL_INVALID_MEM_OBJECT;
         }
     };
diff --git a/unit_tests/d3d_sharing/d3d_tests.cpp b/unit_tests/d3d_sharing/d3d_tests.cpp
index 32e5cfbcc5..6da9fca372 100644
--- a/unit_tests/d3d_sharing/d3d_tests.cpp
+++ b/unit_tests/d3d_sharing/d3d_tests.cpp
@@ -1471,7 +1471,7 @@ TEST(D3DSurfaceTest, givenD3DSurfaceWhenInvalidMemObjectIsPassedToValidateUpdate
     MockBuffer buffer;
     UpdateData updateData;
     updateData.memObject = &buffer;
-    auto result = surface->validateUpdateData(&updateData);
+    auto result = surface->validateUpdateData(updateData);
     EXPECT_EQ(CL_INVALID_MEM_OBJECT, result);
 }
 } // namespace OCLRT
diff --git a/unit_tests/kernel/kernel_image_arg_tests.cpp b/unit_tests/kernel/kernel_image_arg_tests.cpp
index a816ebb888..50afc2783f 100644
--- a/unit_tests/kernel/kernel_image_arg_tests.cpp
+++ b/unit_tests/kernel/kernel_image_arg_tests.cpp
@@ -251,8 +251,8 @@ TEST_F(KernelImageArgTest, givenNullKernelWhenClSetKernelArgCalledThenInvalidKer
 
 class MockSharingHandler : public SharingHandler {
   public:
-    void synchronizeObject(UpdateData *updateData) override {
-        updateData->synchronizationStatus = ACQUIRE_SUCCESFUL;
+    void synchronizeObject(UpdateData &updateData) override {
+        updateData.synchronizationStatus = ACQUIRE_SUCCESFUL;
     }
 };
 
diff --git a/unit_tests/sharings/sharing_tests.cpp b/unit_tests/sharings/sharing_tests.cpp
index 47ec20982c..150f9d8170 100644
--- a/unit_tests/sharings/sharing_tests.cpp
+++ b/unit_tests/sharings/sharing_tests.cpp
@@ -30,12 +30,12 @@ using namespace OCLRT;
 
 TEST(sharingHandler, givenBasicSharingHandlerWhenSynchronizeObjectThenErrorIsReturned) {
     struct SH : SharingHandler {
-        int synchronizeHandlerMock(UpdateData *updateData) { return synchronizeHandler(updateData); }
+        int synchronizeHandlerMock(UpdateData &updateData) { return synchronizeHandler(updateData); }
 
     } sharingHandler;
 
     UpdateData updateData;
-    sharingHandler.synchronizeHandlerMock(&updateData);
+    sharingHandler.synchronizeHandlerMock(updateData);
     EXPECT_EQ(SynchronizeStatus::SYNCHRONIZE_ERROR, updateData.synchronizationStatus);
 
     size_t paramSize = 0;
@@ -62,8 +62,8 @@ TEST(sharingHandler, givenMemObjWhenAcquireIncrementCounterThenReleaseShouldDecr
             SharingHandler::release(memObj);
             return acquireCount;
         }
-        void synchronizeObject(UpdateData *updateData) override {
-            updateData->synchronizationStatus = ACQUIRE_SUCCESFUL;
+        void synchronizeObject(UpdateData &updateData) override {
+            updateData.synchronizationStatus = ACQUIRE_SUCCESFUL;
         }
     } sharingHandler;
 
@@ -90,8 +90,8 @@ TEST(sharingHandler, givenMemObjWhenAcquireTwoTimesThenReleaseShouldBeCalledTwoT
             SharingHandler::release(memObj);
             return acquireCount;
         }
-        void synchronizeObject(UpdateData *updateData) override {
-            updateData->synchronizationStatus = ACQUIRE_SUCCESFUL;
+        void synchronizeObject(UpdateData &updateData) override {
+            updateData.synchronizationStatus = ACQUIRE_SUCCESFUL;
         }
         void releaseResource(MemObj *memObject) override {
             releaseCount++;
@@ -113,7 +113,7 @@ TEST(sharingHandler, givenSharingHandlerWhenValidateUpdateDataIsCalledWithNonNul
     };
     MockSharingHandler sharingHandler;
     UpdateData updateData;
-    sharingHandler.validateUpdateData(&updateData);
+    sharingHandler.validateUpdateData(updateData);
 }
 
 TEST(sharingHandler, givenSharingHandlerWhenAcquiringThenReturnErrorCode) {