diff --git a/lnst/Controller/Machine.py b/lnst/Controller/Machine.py
index 3fabcaf0b..9555fc1a7 100644
--- a/lnst/Controller/Machine.py
+++ b/lnst/Controller/Machine.py
@@ -135,8 +135,11 @@ def remote_device_set_netns(self, dev, dst, src):
         dev_args = dev._dev_args
         dev_kwargs = dev._dev_kwargs
 
-        if dev.peer_name:
-            dev_kwargs['peer_name'] = dev.peer_name
+        try:
+            if dev.peer_name:
+                dev_kwargs['peer_name'] = dev.peer_name
+        except AttributeError:
+            pass
 
         self.rpc_call("remap_device",
                 dev.ifindex,