diff --git a/Source/Engine/Graphics/Textures/GPUTexture.cpp b/Source/Engine/Graphics/Textures/GPUTexture.cpp
index f46466f5c..f2cd85b69 100644
--- a/Source/Engine/Graphics/Textures/GPUTexture.cpp
+++ b/Source/Engine/Graphics/Textures/GPUTexture.cpp
@@ -415,6 +415,8 @@ bool GPUTexture::Init(const GPUTextureDescription& desc)
             || desc.ArraySize > device->Limits.MaximumTexture2DArraySize)
         {
             LOG(Warning, "Cannot create texture. Invalid dimensions. Description: {0}", desc.ToString());
+            if (desc.Width > 0 && desc.Height > 0 && desc.ArraySize > 0)
+                LOG(Warning, "GPU device supports max 2D texture size {} and array size: {}", device->Limits.MaximumTexture2DSize, device->Limits.MaximumTexture2DArraySize);
             return true;
         }
 
@@ -453,6 +455,8 @@ bool GPUTexture::Init(const GPUTextureDescription& desc)
             || desc.Depth > device->Limits.MaximumTexture3DSize)
         {
             LOG(Warning, "Cannot create texture. Invalid dimensions. Description: {0}", desc.ToString());
+            if (desc.Width > 0 && desc.Height > 0 && desc.Depth > 0)
+                LOG(Warning, "GPU device supports max 3D texture size {}", device->Limits.MaximumTexture3DSize);
             return true;
         }
 
@@ -472,6 +476,8 @@ bool GPUTexture::Init(const GPUTextureDescription& desc)
             || desc.Width != desc.Height)
         {
             LOG(Warning, "Cannot create texture. Invalid dimensions. Description: {0}", desc.ToString());
+            if (desc.Width > 0 && desc.Height > 0 && desc.ArraySize > 0)
+                LOG(Warning, "GPU device supports max cue texture size {} and array size: {}", device->Limits.MaximumTextureCubeSize, device->Limits.MaximumTexture2DArraySize / 6);
             return true;
         }
 
diff --git a/Source/Engine/GraphicsDevice/DirectX/DX11/GPUContextDX11.cpp b/Source/Engine/GraphicsDevice/DirectX/DX11/GPUContextDX11.cpp
index 3127a8a42..4c8d71fc5 100644
--- a/Source/Engine/GraphicsDevice/DirectX/DX11/GPUContextDX11.cpp
+++ b/Source/Engine/GraphicsDevice/DirectX/DX11/GPUContextDX11.cpp
@@ -876,7 +876,7 @@ void GPUContextDX11::Flush()
 void GPUContextDX11::UpdateBuffer(GPUBuffer* buffer, const void* data, uint32 size, uint32 offset)
 {
     ASSERT(data);
-    ASSERT(buffer && buffer->GetSize() >= size);
+    ASSERT(buffer && buffer->GetSize() >= size + offset);
 
     auto bufferDX11 = (GPUBufferDX11*)buffer;
 
diff --git a/Source/Engine/GraphicsDevice/DirectX/DX12/GPUContextDX12.cpp b/Source/Engine/GraphicsDevice/DirectX/DX12/GPUContextDX12.cpp
index 25e02bf29..70d163768 100644
--- a/Source/Engine/GraphicsDevice/DirectX/DX12/GPUContextDX12.cpp
+++ b/Source/Engine/GraphicsDevice/DirectX/DX12/GPUContextDX12.cpp
@@ -1373,7 +1373,7 @@ void GPUContextDX12::Flush()
 void GPUContextDX12::UpdateBuffer(GPUBuffer* buffer, const void* data, uint32 size, uint32 offset)
 {
     ASSERT(data);
-    ASSERT(buffer && buffer->GetSize() >= size);
+    ASSERT(buffer && buffer->GetSize() >= size + offset);
 
     auto bufferDX12 = (GPUBufferDX12*)buffer;
 
diff --git a/Source/Engine/GraphicsDevice/Vulkan/GPUContextVulkan.cpp b/Source/Engine/GraphicsDevice/Vulkan/GPUContextVulkan.cpp
index ec7584ff9..6c1b076fa 100644
--- a/Source/Engine/GraphicsDevice/Vulkan/GPUContextVulkan.cpp
+++ b/Source/Engine/GraphicsDevice/Vulkan/GPUContextVulkan.cpp
@@ -1450,7 +1450,7 @@ void GPUContextVulkan::Flush()
 void GPUContextVulkan::UpdateBuffer(GPUBuffer* buffer, const void* data, uint32 size, uint32 offset)
 {
     ASSERT(data);
-    ASSERT(buffer && buffer->GetSize() >= size);
+    ASSERT(buffer && buffer->GetSize() >= size + offset);
 
     const auto cmdBuffer = _cmdBufferManager->GetCmdBuffer();
     if (cmdBuffer->IsInsideRenderPass())