diff --git a/renderdoc/driver/d3d12/d3d12_manager.cpp b/renderdoc/driver/d3d12/d3d12_manager.cpp
index 5e27a8c65..2f6f44977 100644
--- a/renderdoc/driver/d3d12/d3d12_manager.cpp
+++ b/renderdoc/driver/d3d12/d3d12_manager.cpp
@@ -957,14 +957,14 @@ bool D3D12ResourceManager::Serialise_InitialState(ResourceId resid, ID3D12Device
       HRESULT hr = m_Device->GetReal()->CreateDescriptorHeap(&desc, __uuidof(ID3D12DescriptorHeap),
                                                              (void **)&copyheap);
 
-      copyheap = new WrappedID3D12DescriptorHeap(copyheap, m_Device, desc);
-
       if(FAILED(hr))
       {
         RDCERR("Failed to create CPU descriptor heap for initial state: 0x%08x", hr);
         return false;
       }
 
+      copyheap = new WrappedID3D12DescriptorHeap(copyheap, m_Device, desc);
+
       D3D12_CPU_DESCRIPTOR_HANDLE handle = copyheap->GetCPUDescriptorHandleForHeapStart();
 
       UINT increment = m_Device->GetDescriptorHandleIncrementSize(desc.Type);