diff --git a/run.py b/run.py
index 23601b2..92fc11d 100644
--- a/run.py
+++ b/run.py
@@ -730,7 +730,7 @@ def get_objects(self, vc_obj_type):
                     if platform:
                         for index, nic in enumerate(obj.guest.net):
                             # Interfaces
-                            nic_name = "vNIC{}".format(index)
+                            nic_name = nic.network if nic.network else "vNIC{}".format(index)
                             log.debug(
                                 "Collecting info for virtual interface '%s'.",
                                 nic_name
@@ -739,7 +739,7 @@ def get_objects(self, vc_obj_type):
                                 nbt.vm_interface(
                                     virtual_machine=obj_name,
                                     itype=0,
-                                    name=nic_name,
+                                    name=truncate(nic_name, 64),
                                     mac_address=nic.macAddress,
                                     enabled=nic.connected,
                                     tags=self.tags
@@ -1098,7 +1098,7 @@ def obj_exists(self, nb_obj_type, vc_data):
         elif nb_obj_type == "virtual_interfaces":
             query = "?virtual_machine={}&{}={}".format(
                 quote_plus(vc_data["virtual_machine"]["name"]), query_key,
-                vc_data[query_key]
+                quote_plus(vc_data[query_key])
                 )
         else:
             query = "?{}={}".format(