diff --git a/omnistat-annotate b/omnistat-annotate
index 80a8815d..f9205b87 100755
--- a/omnistat-annotate
+++ b/omnistat-annotate
@@ -29,8 +29,9 @@ import sys
 
 try:
     from omnistat.annotate import main
-except:
-    print("Unable to load omnistat.annotate. Please verify installation.")
+except ImportError as err:
+    print(f"Unable to load Omnistat: {err}")
+    print("Please verify installation and dependencies.")
     sys.exit(1)
 
 if __name__ == "__main__":
diff --git a/omnistat-monitor b/omnistat-monitor
index 20fbd622..6aefda69 100755
--- a/omnistat-monitor
+++ b/omnistat-monitor
@@ -29,8 +29,9 @@ import sys
 
 try:
     from omnistat.node_monitoring import main
-except:
-    print("Unable to load omnistat.node_monitoring. Please verify installation.")
+except ImportError as err:
+    print(f"Unable to load Omnistat: {err}")
+    print("Please verify installation and dependencies.")
     sys.exit(1)
 
 if __name__ == "__main__":
diff --git a/omnistat-query b/omnistat-query
index 7f7207c5..8e615e43 100755
--- a/omnistat-query
+++ b/omnistat-query
@@ -29,8 +29,9 @@ import sys
 
 try:
     from omnistat.query import main
-except:
-    print("Unable to load omnistat.query. Please verify installation.")
+except ImportError as err:
+    print(f"Unable to load Omnistat: {err}")
+    print("Please verify installation and dependencies.")
     sys.exit(1)
 
 if __name__ == "__main__":
diff --git a/omnistat-rms-env b/omnistat-rms-env
index 3541c6eb..1ae9953a 100755
--- a/omnistat-rms-env
+++ b/omnistat-rms-env
@@ -29,8 +29,9 @@ import sys
 
 try:
     from omnistat.rms_env import main
-except:
-    print("Unable to load omnistat.rms_env. Please verify installation.")
+except ImportError as err:
+    print(f"Unable to load Omnistat: {err}")
+    print("Please verify installation and dependencies.")
     sys.exit(1)
 
 if __name__ == "__main__":
diff --git a/omnistat-standalone b/omnistat-standalone
index 1f5c3b4f..334b5e68 100755
--- a/omnistat-standalone
+++ b/omnistat-standalone
@@ -1,5 +1,5 @@
 #!/usr/bin/env python3
-# -------------------------------------------------------------------------------                                                                                                             # -------------------------------------------------------------------------------
+# -------------------------------------------------------------------------------
 # MIT License
 #
 # Copyright (c) 2023 - 2025 Advanced Micro Devices, Inc. All Rights Reserved.
@@ -27,13 +27,11 @@
 import os
 import sys
 
-if os.path.isdir("omnistat") and sys.path[0]:
-    sys.path.insert(0, "")
-
 try:
     from omnistat.standalone import main
-except:
-    print("Unable to load omnistat.standalone. Please verify installation.")
+except ImportError as err:
+    print(f"Unable to load Omnistat: {err}")
+    print("Please verify installation and dependencies.")
     sys.exit(1)
 
 if __name__ == "__main__":
diff --git a/omnistat-usermode b/omnistat-usermode
index f7c89f36..a0db786b 100755
--- a/omnistat-usermode
+++ b/omnistat-usermode
@@ -29,8 +29,9 @@ import sys
 
 try:
     from omnistat.omni_util import main
-except:
-    print("Unable to load omnistat.omni_util. Please verify installation.")
+except ImportError as err:
+    print(f"Unable to load Omnistat: {err}")
+    print("Please verify installation and dependencies.")
     sys.exit(1)
 
 if __name__ == "__main__":