diff --git a/ophyd_devices/eiger1p5m_csaxs/eiger1p5m.py b/ophyd_devices/eiger1p5m_csaxs/eiger1p5m.py
index ba0ebfd..f677d8b 100644
--- a/ophyd_devices/eiger1p5m_csaxs/eiger1p5m.py
+++ b/ophyd_devices/eiger1p5m_csaxs/eiger1p5m.py
@@ -119,6 +119,13 @@ class Eiger1p5MDetector(Device):
         # set the exposure time
         self.exp_time.set(exp_time)
 
+        # wait for detector control to become "ready"
+        while True:
+            det_ctrl = self.detector_control.get()
+            if det_ctrl == "ready":
+                break
+            time.sleep(0.005)
+
         # send the "begin" flag to start processing the above commands
         self.detector_control.set("begin")
 
@@ -146,6 +153,8 @@ class Eiger1p5MDetector(Device):
                 )
                 time_waited += sleep_time
                 time.sleep(sleep_time)
+                if self._stopped:
+                    break
                 continue
             break
         self.detector_control.put("stop")
@@ -154,6 +163,7 @@ class Eiger1p5MDetector(Device):
         self.device_manager.producer.set_and_publish(
             MessageEndpoints.device_read(self.name), msg.dumps()
         )
+        self._stopped = False
         return super().unstage()
 
     def stop(self, *, success=False):
diff --git a/ophyd_devices/rt_lamni/rt_lamni_ophyd.py b/ophyd_devices/rt_lamni/rt_lamni_ophyd.py
index b4303d2..8084577 100644
--- a/ophyd_devices/rt_lamni/rt_lamni_ophyd.py
+++ b/ophyd_devices/rt_lamni/rt_lamni_ophyd.py
@@ -88,8 +88,17 @@ class RtLamniController(Controller):
             try:
                 self.sock.open()
                 # discuss - after disconnect takes a while for the server to be ready again
-                welcome_message = self.sock.receive()
-                self.connected = True
+                max_retries = 10
+                tries = 0
+                while not self.connected:
+                    try:
+                        welcome_message = self.sock.receive()
+                        self.connected = True
+                    except ConnectionResetError as conn_reset:
+                        if tries > max_retries:
+                            raise conn_reset
+                        tries += 1
+                        time.sleep(2)
             except ConnectionRefusedError as conn_error:
                 logger.error("Failed to open a connection to RTLamNI.")
                 raise RtLamniCommunicationError from conn_error