Imported Upstream version 2.0.0.11992upstream/2.0.0.11992

1 files changed, 12 insertions, 1 deletions

diff --git a/src/vm/peimagelayout.cpp b/src/vm/peimagelayout.cpp
index 24166817bb..34ba4d8215 100644
--- a/src/vm/peimagelayout.cpp
+++ b/src/vm/peimagelayout.cpp
@@ -392,10 +392,21 @@ MappedImageLayout::MappedImageLayout(HANDLE hFile, PEImage* pOwner)
     {
 #ifndef CROSSGEN_COMPILE
 
+        // Capture last error as it may get reset below.
+        
+        DWORD dwLastError = GetLastError();
         // There is no reflection-only load on CoreCLR and so we can always throw an error here.
         // It is important on Windows Phone. All assemblies that we load must have SEC_IMAGE set
         // so that the OS can perform signature verification.
-        ThrowLastError();
+        if (pOwner->IsFile())
+        {
+            EEFileLoadException::Throw(pOwner->GetPathForErrorMessages(), HRESULT_FROM_WIN32(dwLastError));
+        }
+        else
+        {
+            // Throw generic exception.
+            ThrowWin32(dwLastError);
+        }
 
 #endif // CROSSGEN_COMPILE