diff --git a/src/pyedb/dotnet/edb_core/cell/terminal/terminal.py b/src/pyedb/dotnet/edb_core/cell/terminal/terminal.py
index 854e1ba9c8..0e3385e0d6 100644
--- a/src/pyedb/dotnet/edb_core/cell/terminal/terminal.py
+++ b/src/pyedb/dotnet/edb_core/cell/terminal/terminal.py
@@ -105,12 +105,11 @@ def hfss_type(self, value):
     @property
     def layer(self):
         """Get layer of the terminal."""
-        point_data = self._pedb.point_data(0, 0)
-        layer = list(self._pedb.stackup.layers.values())[0]._edb_layer
-        if self._edb_object.GetParameters(point_data, layer):
+        try:
+            _, _, layer = self._edb_object.GetParameters()
             return self._pedb.stackup.all_layers[layer.GetName()]
-        else:
-            self._pedb.logger.warning(f"No pad parameters found for terminal {self.name}")
+        except:
+            self._pedb.logger.error("Cannot determine terminal layer")
 
     @layer.setter
     def layer(self, value):
@@ -121,9 +120,11 @@ def layer(self, value):
     @property
     def location(self):
         """Location of the terminal."""
-        layer = list(self._pedb.stackup.layers.values())[0]._edb_layer
-        _, point_data, _ = self._edb_object.GetParameters(None, layer)
-        return [point_data.X.ToDouble(), point_data.Y.ToDouble()]
+        try:
+            _, point_data, _ = self._edb_object.GetParameters()
+            return [point_data.X.ToDouble(), point_data.Y.ToDouble()]
+        except:
+            self._pedb.logger.error("Cannot determine terminal location")
 
     @location.setter
     def location(self, value):