diff --git a/hurricane/src/hurricane/Pin.cpp b/hurricane/src/hurricane/Pin.cpp
index bcfb5771..5de59b96 100644
--- a/hurricane/src/hurricane/Pin.cpp
+++ b/hurricane/src/hurricane/Pin.cpp
@@ -76,9 +76,8 @@ void Pin::_postCreate()
 void Pin::_preDestroy()
 // *********************
 {
-    Inherit::_preDestroy();
-
-    getCell()->_getPinMap()._remove(this);
+  Inherit::_preDestroy();
+  getCell()->_getPinMap()._remove(this);
 }
 
 string Pin::_getString() const
diff --git a/hurricane/src/hurricane/RoutingPad.cpp b/hurricane/src/hurricane/RoutingPad.cpp
index f01ba04b..1c161313 100644
--- a/hurricane/src/hurricane/RoutingPad.cpp
+++ b/hurricane/src/hurricane/RoutingPad.cpp
@@ -319,11 +319,16 @@ namespace Hurricane {
     Net*       net       = component->getNet();
     Path       path      = _occurrence.getPath();
 
-    if (path.isEmpty())
-      throw Error( "RoutingPad::getPlugOccurrence(): Empty Path, *not* in an instance for\n"
-                   "        %s"
-                 , getString(this).c_str()
-                 );
+    if (path.isEmpty()) {
+      Pin* pin = dynamic_cast<Pin*>( component );
+      if (not pin)
+        throw Error( "RoutingPad::getPlugOccurrence(): Empty Path, *not* in an instance for\n"
+                     "        %s"
+                   , getString(this).c_str()
+                   );
+
+      return Occurrence(pin,Path());
+    }
 
     Instance* instance = path.getTailInstance();
     Plug*     plug     = instance->getPlug(net);