diff --git a/reactos/dll/win32/advapi32/sec/ac.c b/reactos/dll/win32/advapi32/sec/ac.c
index 2d12d6ec0f9..f9e64658419 100644
--- a/reactos/dll/win32/advapi32/sec/ac.c
+++ b/reactos/dll/win32/advapi32/sec/ac.c
@@ -729,15 +729,7 @@ InternalTrusteeAToW(IN PTRUSTEE_A pTrusteeA,
                                             StrBuf,
                                             BufferSize) == 0)
                     {
-ConvertErr:
-                        ErrorCode = GetLastError();
-
-                        /* cleanup */
-                        RtlFreeHeap(RtlGetProcessHeap(),
-                                    0,
-                                    *pTrusteeW);
-
-                        return ErrorCode;
+                        goto ConvertErr;
                     }
                     oan->ptstrName = StrBuf;
                 }
@@ -759,6 +751,16 @@ NothingToConvert:
     }
 
     return ErrorCode;
+
+ConvertErr:
+    ErrorCode = GetLastError();
+
+    /* cleanup */
+    RtlFreeHeap(RtlGetProcessHeap(),
+                0,
+                *pTrusteeW);
+
+    return ErrorCode;
 }
 
 
@@ -930,15 +932,7 @@ InternalExplicitAccessAToW(IN ULONG cCountOfExplicitEntries,
                                                     StrBuf,
                                                     BufferSize) == 0)
                             {
-ConvertErr:
-                                ErrorCode = GetLastError();
-
-                                /* cleanup */
-                                RtlFreeHeap(RtlGetProcessHeap(),
-                                            0,
-                                            peaw);
-
-                                return ErrorCode;
+                                goto ConvertErr;
                             }
                             oan->ptstrName = StrBuf;
 
@@ -973,6 +967,16 @@ RawTrusteeCopy:
     }
 
     return ErrorCode;
+
+ConvertErr:
+    ErrorCode = GetLastError();
+
+    /* cleanup */
+    RtlFreeHeap(RtlGetProcessHeap(),
+                0,
+                peaw);
+
+    return ErrorCode;
 }