diff --git a/mpsd-software-environment.py b/mpsd-software-environment.py
index 5b6538b65fda4d335473f6d6e9245cfccf7c9eb9..f2e61e770511c5ab3295b631ed693b285b449dd6 100755
--- a/mpsd-software-environment.py
+++ b/mpsd-software-environment.py
@@ -491,9 +491,10 @@ def install_environment(
 
     for toolchain in toolchains:
         if toolchain not in available_toolchains:
-            raise ValueError(
-                f"Toolchain '{toolchain}' is not available in release {mpsd_release}."
-            )
+            # TODO: add to message how toolchains can be found
+            msg = f"Toolchain '{toolchain}' is not available in release {mpsd_release}."
+            logging.error(msg)
+            sys.exit(1)
 
     # Install the toolchains
     with os_chdir(toolchain_dir):