diff --git a/.bin/Scripts/functions/common.py b/.bin/Scripts/functions/common.py
index cdf948fe..841d17e7 100644
--- a/.bin/Scripts/functions/common.py
+++ b/.bin/Scripts/functions/common.py
@@ -64,10 +64,13 @@ class GenericRepair(Exception):
 class MultipleInstallationsError(Exception):
   pass
 
-class NotInstalledError(Exception):
+class NoProfilesError(Exception):
   pass
 
-class NoProfilesError(Exception):
+class Not4KAlignedError(Exception):
+  pass
+
+class NotInstalledError(Exception):
   pass
 
 class OSInstalledLegacyError(Exception):
@@ -88,6 +91,12 @@ class SecureBootNotAvailError(Exception):
 class SecureBootUnknownError(Exception):
   pass
 
+class WindowsOutdatedError(Exception):
+  pass
+
+class WindowsUnsupportedError(Exception):
+  pass
+
 
 # General functions
 def abort(show_prompt=True):
diff --git a/.bin/Scripts/functions/sw_diags.py b/.bin/Scripts/functions/sw_diags.py
index 2d3d1df7..3432adab 100644
--- a/.bin/Scripts/functions/sw_diags.py
+++ b/.bin/Scripts/functions/sw_diags.py
@@ -6,14 +6,6 @@ from functions.common import *
 from settings.sw_diags import *
 
 
-class Not4KAlignedError(Exception):
-  pass
-class WindowsOutdatedError(Exception):
-  pass
-class WindowsUnsupportedError(Exception):
-  pass
-
-
 def check_4k_alignment(show_alert=False):
   """Check that all partitions are 4K aligned."""
   aligned = True