diff --git a/doc/contributions.txt b/doc/contributions.txt
index a73bd10295bdbb8989189a2fe63b7c213cf3c747..29fc71510b6bde3a0b4bf395207402408d3a2a47 100755
--- a/doc/contributions.txt
+++ b/doc/contributions.txt
@@ -1073,6 +1073,7 @@ Nicky Dasmijn
 	MAINT-6665
 	SL-10291
 	SL-10293
+	SL-11061
 Nicky Perian
 	OPEN-1
 	STORM-1087
diff --git a/indra/newview/llmachineid.cpp b/indra/newview/llmachineid.cpp
index c667b0af3f75f39396ca0a0051d551681c044f4a..51127928d1271e9125fb4bb2b829991cb0bc2b5c 100644
--- a/indra/newview/llmachineid.cpp
+++ b/indra/newview/llmachineid.cpp
@@ -217,6 +217,13 @@ S32 LLMachineID::init()
 
             // Get the value of the Name property
             hr = pclsObj->Get(L"SerialNumber", 0, &vtProp, 0, 0);
+            if (FAILED(hr))
+            {
+                LL_WARNS() << "Failed to get SerialNumber. Error code = 0x" << hex << hres << LL_ENDL;
+                pclsObj->Release();
+                pclsObj = NULL;
+                continue;
+            }
             LL_INFOS("AppInit") << " Serial Number : " << vtProp.bstrVal << LL_ENDL;
 
             // use characters in the returned Serial Number to create a byte array of size len