diff --git a/daq/src/aaredaq/daq.py b/daq/src/aaredaq/daq.py
index 5b2b77d9..561d9179 100644
--- a/daq/src/aaredaq/daq.py
+++ b/daq/src/aaredaq/daq.py
@@ -372,7 +372,7 @@ class AareDAQ:
                 self.__cfg.current_sample = None
                 if target is not None:
                     raise e
-            elif (target.location is not None
+            elif target is not None and (target.location is not None
                   and mounted_sample.puck.pos == target.location.pos
                   and mounted_sample.puck.segment == target.location.segment
                   and mounted_sample.pin == target.pin):