diff --git a/base/system/diskpart/automount.c b/base/system/diskpart/automount.c
index 7f9430784ea..e578b8b3007 100644
--- a/base/system/diskpart/automount.c
+++ b/base/system/diskpart/automount.c
@@ -195,16 +195,16 @@ automount_main(
 
     DPRINT("Automount()\n");
 
-#if 0
     for (i = 1; i < argc; i++)
     {
         if (_wcsicmp(argv[i], L"noerr") == 0)
         {
             /* noerr */
+#if 0
             bNoErr = TRUE;
+#endif
         }
     }
-#endif
 
     for (i = 1; i < argc; i++)
     {
@@ -225,7 +225,7 @@ automount_main(
         }
         else if (_wcsicmp(argv[i], L"noerr") == 0)
         {
-            /* already handled */
+            /* noerr - Already handled above */
         }
         else
         {
diff --git a/base/system/diskpart/create.c b/base/system/diskpart/create.c
index 3097cf05261..998a4ea123e 100644
--- a/base/system/diskpart/create.c
+++ b/base/system/diskpart/create.c
@@ -43,6 +43,19 @@ CreateEfiPartition(
         return TRUE;
     }
 
+    for (i = 3; i < argc; i++)
+    {
+        if (_wcsicmp(argv[i], L"noerr") == 0)
+        {
+            /* noerr */
+            DPRINT("NoErr\n", pszSuffix);
+            ConPuts(StdOut, L"The NOERR option is not supported yet!\n");
+#if 0
+            bNoErr = TRUE;
+#endif
+        }
+    }
+
     for (i = 3; i < argc; i++)
     {
         if (HasPrefix(argv[i], L"size=", &pszSuffix))
@@ -73,12 +86,7 @@ CreateEfiPartition(
         }
         else if (_wcsicmp(argv[i], L"noerr") == 0)
         {
-            /* noerr */
-            DPRINT("NoErr\n", pszSuffix);
-            ConPuts(StdOut, L"The NOERR option is not supported yet!\n");
-#if 0
-            bNoErr = TRUE;
-#endif
+            /* noerr - Already handled above */
         }
         else
         {
@@ -251,6 +259,19 @@ CreateExtendedPartition(
         ScanForUnpartitionedMbrDiskSpace(CurrentDisk);
     }
 
+    for (i = 3; i < argc; i++)
+    {
+        if (_wcsicmp(argv[i], L"noerr") == 0)
+        {
+            /* noerr */
+            DPRINT("NoErr\n", pszSuffix);
+            ConPuts(StdOut, L"The NOERR option is not supported yet!\n");
+#if 0
+            bNoErr = TRUE;
+#endif
+        }
+    }
+
     for (i = 3; i < argc; i++)
     {
         if (HasPrefix(argv[i], L"size=", &pszSuffix))
@@ -290,12 +311,7 @@ CreateExtendedPartition(
         }
         else if (_wcsicmp(argv[i], L"noerr") == 0)
         {
-            /* noerr */
-            DPRINT("NoErr\n", pszSuffix);
-            ConPuts(StdOut, L"The NOERR option is not supported yet!\n");
-#if 0
-            bNoErr = TRUE;
-#endif
+            /* noerr - Already handled above */
         }
         else
         {
@@ -437,6 +453,19 @@ CreateLogicalPartition(
         return TRUE;
     }
 
+    for (i = 3; i < argc; i++)
+    {
+        if (_wcsicmp(argv[i], L"noerr") == 0)
+        {
+            /* noerr */
+            DPRINT("NoErr\n", pszSuffix);
+            ConPuts(StdOut, L"The NOERR option is not supported yet!\n");
+#if 0
+            bNoErr = TRUE;
+#endif
+        }
+    }
+
     for (i = 3; i < argc; i++)
     {
         if (HasPrefix(argv[i], L"size=", &pszSuffix))
@@ -498,12 +527,7 @@ CreateLogicalPartition(
         }
         else if (_wcsicmp(argv[i], L"noerr") == 0)
         {
-            /* noerr */
-            DPRINT("NoErr\n", pszSuffix);
-            ConPuts(StdOut, L"The NOERR option is not supported yet!\n");
-#if 0
-            bNoErr = TRUE;
-#endif
+            /* noerr - Already handled above */
         }
         else
         {
@@ -638,6 +662,19 @@ CreateMsrPartition(
         return TRUE;
     }
 
+    for (i = 3; i < argc; i++)
+    {
+        if (_wcsicmp(argv[i], L"noerr") == 0)
+        {
+            /* noerr */
+            DPRINT("NoErr\n", pszSuffix);
+            ConPuts(StdOut, L"The NOERR option is not supported yet!\n");
+#if 0
+            bNoErr = TRUE;
+#endif
+        }
+    }
+
     for (i = 3; i < argc; i++)
     {
         if (HasPrefix(argv[i], L"size=", &pszSuffix))
@@ -668,12 +705,7 @@ CreateMsrPartition(
         }
         else if (_wcsicmp(argv[i], L"noerr") == 0)
         {
-            /* noerr */
-            DPRINT("NoErr\n", pszSuffix);
-            ConPuts(StdOut, L"The NOERR option is not supported yet!\n");
-#if 0
-            bNoErr = TRUE;
-#endif
+            /* noerr - Already handled above */
         }
         else
         {
@@ -1099,6 +1131,19 @@ CreatePrimaryPartition(
         ScanForUnpartitionedMbrDiskSpace(CurrentDisk);
     }
 
+    for (i = 3; i < argc; i++)
+    {
+        if (_wcsicmp(argv[i], L"noerr") == 0)
+        {
+            /* noerr */
+            DPRINT("NoErr\n", pszSuffix);
+            ConPuts(StdOut, L"The NOERR option is not supported yet!\n");
+#if 0
+            bNoErr = TRUE;
+#endif
+        }
+    }
+
     for (i = 3; i < argc; i++)
     {
         if (HasPrefix(argv[i], L"size=", &pszSuffix))
@@ -1144,12 +1189,7 @@ CreatePrimaryPartition(
         }
         else if (_wcsicmp(argv[i], L"noerr") == 0)
         {
-            /* noerr */
-            DPRINT("NoErr\n", pszSuffix);
-            ConPuts(StdOut, L"The NOERR option is not supported yet!\n");
-#if 0
-            bNoErr = TRUE;
-#endif
+            /* noerr - Alread handled above */
         }
         else
         {
diff --git a/base/system/diskpart/delete.c b/base/system/diskpart/delete.c
index 580fccd6d42..36a829a032d 100644
--- a/base/system/diskpart/delete.c
+++ b/base/system/diskpart/delete.c
@@ -303,6 +303,14 @@ DeletePartition(
             bNoErr = TRUE;
 #endif
         }
+    }
+
+    for (i = 2; i < argc; i++)
+    {
+        if (_wcsicmp(argv[i], L"noerr") == 0)
+        {
+            /* noerr - Already handled above */
+        }
         else if (_wcsicmp(argv[i], L"override") == 0)
         {
             /* override */
diff --git a/base/system/diskpart/setid.c b/base/system/diskpart/setid.c
index 1380c8f1620..a75e4431e64 100644
--- a/base/system/diskpart/setid.c
+++ b/base/system/diskpart/setid.c
@@ -35,6 +35,16 @@ setid_main(
         return TRUE;
     }
 
+    for (i = 1; i < argc; i++)
+    {
+        if (_wcsicmp(argv[i], L"noerr") == 0)
+        {
+            /* noerr */
+            DPRINT("NOERR\n");
+            ConPuts(StdOut, L"The NOERR option is not supported yet!\n");
+        }
+    }
+
     for (i = 1; i < argc; i++)
     {
         if (HasPrefix(argv[i], L"id=", &pszSuffix))
@@ -45,9 +55,7 @@ setid_main(
         }
         else if (_wcsicmp(argv[i], L"noerr") == 0)
         {
-            /* noerr */
-            DPRINT("NOERR\n");
-            ConPuts(StdOut, L"The NOERR option is not supported yet!\n");
+            /* noerr - Already handled above */
         }
         else if (_wcsicmp(argv[i], L"override") == 0)
         {
diff --git a/base/system/diskpart/uniqueid.c b/base/system/diskpart/uniqueid.c
index e38bba03ac0..280c8f8edea 100644
--- a/base/system/diskpart/uniqueid.c
+++ b/base/system/diskpart/uniqueid.c
@@ -49,6 +49,16 @@ UniqueIdDisk(
         return TRUE;
     }
 
+    for (i = 1; i < argc; i++)
+    {
+        if (_wcsicmp(argv[i], L"noerr") == 0)
+        {
+            /* noerr */
+            DPRINT("NOERR\n");
+            ConPuts(StdOut, L"The NOERR option is not supported yet!\n");
+        }
+    }
+
     for (i = 1; i < argc; i++)
     {
         if (HasPrefix(argv[2], L"id=", &pszSuffix))
@@ -59,9 +69,7 @@ UniqueIdDisk(
         }
         else if (_wcsicmp(argv[i], L"noerr") == 0)
         {
-            /* noerr */
-            DPRINT("NOERR\n");
-            ConPuts(StdOut, L"The NOERR option is not supported yet!\n");
+            /* noerr - Already handled above */
         }
         else
         {