diff --git a/Juliet/src/Graphics/D3D12/D3D12GraphicsDevice.cpp b/Juliet/src/Graphics/D3D12/D3D12GraphicsDevice.cpp
index 2efd425..fc69698 100644
--- a/Juliet/src/Graphics/D3D12/D3D12GraphicsDevice.cpp
+++ b/Juliet/src/Graphics/D3D12/D3D12GraphicsDevice.cpp
@@ -194,7 +194,7 @@ namespace Juliet::D3D12
 
         bool InitializeD3D12DebugInfoQueue(NonNullPtr<D3D12Driver> driver)
         {
-            ID3D12InfoQueue*       infoQueue    = NULL;
+            ID3D12InfoQueue*       infoQueue    = nullptr;
             D3D12_MESSAGE_SEVERITY severities[] = { D3D12_MESSAGE_SEVERITY_INFO };
 
             HRESULT result =
@@ -260,22 +260,14 @@ namespace Juliet::D3D12
 
         void InitializeD3D12DebugInfoLogger(NonNullPtr<D3D12Driver> driver)
         {
-            ID3D12InfoQueue* infoQueue = NULL;
-            HRESULT          result =
-                ID3D12Device5_QueryInterface(driver->D3D12Device, IID_ID3D12InfoQueue, reinterpret_cast<void**>(&infoQueue));
-            if (FAILED(result))
-            {
-                LogError(driver, "Failed to get ID3D12InfoQueue", result);
-                return;
-            }
-            ID3D12InfoQueue1* infoQueue1 = nullptr;
-            result = ID3D12Device5_QueryInterface(driver->D3D12Device, IID_ID3D12InfoQueue1, reinterpret_cast<void**>(&infoQueue1));
+            ID3D12InfoQueue1* infoQueue = NULL;
+            HRESULT          result = ID3D12Device5_QueryInterface(driver->D3D12Device, IID_ID3D12InfoQueue1, reinterpret_cast<void**>(&infoQueue));
             if (FAILED(result))
             {
                 return;
             }
 
-            ID3D12InfoQueue1_RegisterMessageCallback(infoQueue1, OnD3D12DebugInfoMsg, D3D12_MESSAGE_CALLBACK_FLAG_NONE, NULL, NULL);
+            ID3D12InfoQueue1_RegisterMessageCallback(infoQueue, OnD3D12DebugInfoMsg, D3D12_MESSAGE_CALLBACK_FLAG_NONE, NULL, NULL);
             ID3D12InfoQueue1_Release(infoQueue);
         }
 #endif