From 988bcd638728629c61fa912b7e387c5d983098bd Mon Sep 17 00:00:00 2001
From: Milan Hanajik <milan.hanajik@xyleminc.com>
Date: Thu, 8 Apr 2021 10:05:02 +0200
Subject: [PATCH] BuiltIn.Valve initialization changed.

---
 TBF/Rig/BuiltIn/Valve/Valve.cs | 10 ++++------
 1 file changed, 4 insertions(+), 6 deletions(-)

diff --git a/TBF/Rig/BuiltIn/Valve/Valve.cs b/TBF/Rig/BuiltIn/Valve/Valve.cs
index 1c646c2c8..035dc055e 100644
--- a/TBF/Rig/BuiltIn/Valve/Valve.cs
+++ b/TBF/Rig/BuiltIn/Valve/Valve.cs
@@ -47,17 +47,15 @@ namespace TBF.Rig.BuiltIn.Valve
 			valveCfg = cfg as ValveCfg;
 
             controlBoard = TbfComponents.FindComponent(cfg.ParentName, components) as TBF.Rig.ControlBoard.IControlBoard;
-			if (controlBoard == null) throw new Exception("Cannot find " + Name + " parent");
+			if (controlBoard == null) throw new Exception(string.Format("Cannot find the parent of {0}", Name));
 
-            if (valveCfg.CoupledToName != null)
+            if (!string.IsNullOrEmpty(valveCfg.CoupledToName))
             {
                 coupledTo = (IValve)TbfComponents.FindComponent(valveCfg.CoupledToName, components);
+                if (coupledTo == null) throw new Exception(string.Format("Cannot find the coupled valve {0}", valveCfg.CoupledToName));
             }
 
-            if (valveCfg.BitNr < 0 || valveCfg.BitNr >= 128)
-            {
-                throw new ArgumentOutOfRangeException("position");
-            }
+            if (valveCfg.BitNr < 0 || valveCfg.BitNr > 127) throw new ArgumentOutOfRangeException("Invalid bit number");
             Mask = (((UInt128)1) << valveCfg.BitNr);
 
             log.Warn(this.ToString());