catch proper exceptions

Opentrons · Jan 17, 2025 · 78dfdcd · 78dfdcd
1 parent 68a5f74
commit 78dfdcd
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 3 deletions.
diff --git a/api/src/opentrons/protocol_engine/commands/flex_stacker/retrieve.py b/api/src/opentrons/protocol_engine/commands/flex_stacker/retrieve.py
@@ -9,6 +9,7 @@
 from ...errors import (
     ErrorOccurrence,
     CannotPerformModuleAction,
+    LocationIsOccupiedError,
 )
 from ...state import update_types
 from ...types import ModuleLocation
@@ -72,7 +73,7 @@ async def execute(self, params: RetrieveParams) -> SuccessData[RetrieveResult]:
 
         try:
             self._state_view.labware.raise_if_labware_in_location(stacker_loc)
-        except Exception:
+        except LocationIsOccupiedError:
             raise CannotPerformModuleAction(
                 "Cannot retrieve a labware from Flex Stacker if the carriage is occupied"
             )

diff --git a/api/src/opentrons/protocol_engine/commands/flex_stacker/store.py b/api/src/opentrons/protocol_engine/commands/flex_stacker/store.py
@@ -6,7 +6,11 @@
 from pydantic import BaseModel, Field
 
 from ..command import AbstractCommandImpl, BaseCommand, BaseCommandCreate, SuccessData
-from ...errors import ErrorOccurrence, CannotPerformModuleAction
+from ...errors import (
+    ErrorOccurrence,
+    CannotPerformModuleAction,
+    LabwareNotLoadedOnModuleError,
+)
 from ...state import update_types
 from ...types import OFF_DECK_LOCATION
 
@@ -59,7 +63,7 @@ async def execute(self, params: StoreParams) -> SuccessData[StoreResult]:
 
         try:
             lw_id = self._state_view.labware.get_id_by_module(params.moduleId)
-        except Exception:
+        except LabwareNotLoadedOnModuleError:
             raise CannotPerformModuleAction(
                 "Cannot store labware if Flex Stacker carriage is empty"
             )