Index: /trunk/FACT++/src/biasctrl.cc
===================================================================
--- /trunk/FACT++/src/biasctrl.cc	(revision 18125)
+++ /trunk/FACT++/src/biasctrl.cc	(revision 18126)
@@ -1916,8 +1916,11 @@
         if (now>fSunRise)
         {
-            if ((state==State::kRamping       ||
-                 state==State::kVoltageOn     ||
-                 state==State::kNotReferenced ||
-                 state==State::kOverCurrent))
+            const bool shutdown =
+                state==State::kRamping       ||
+                state==State::kVoltageOn     ||
+                state==State::kNotReferenced ||
+                state==State::kOverCurrent;
+
+            if (shutdown)
             {
                 T::Error("Voltage on at end of nautical twilight!");
@@ -1931,5 +1934,6 @@
             T::Info(msg);
 
-            return State::kLocked;
+            if (shutdown)
+                return State::kLocked;
         }