Eli Mesika has submitted this change and it was merged. Change subject: core: resolve NPE in VM/Template Export ...................................................................... core: resolve NPE in VM/Template Export When an old template (created before USB support was added to vm devices) is imported to the system. the UsbPolicy of it is null, this results in NPE. The sane occurs for VM import. Change-Id: I6794924558892a4f6999dc0f2257355bae9ca1a7 Signed-off-by: Eli Mesika <emesika(a)redhat.com&gt; --- M backend/manager/modules/utils/src/main/java/org/ovirt/engine/core/utils/ovf/OvfTemplateWriter.java M backend/manager/modules/utils/src/main/java/org/ovirt/engine/core/utils/ovf/OvfVmWriter.java 2 files changed, 5 insertions(+), 2 deletions(-) Approvals: Eli Mesika: Verified; Looks good to me, approved -- To view, visit http://gerrit.ovirt.org/4920 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: merged Gerrit-Change-Id: I6794924558892a4f6999dc0f2257355bae9ca1a7 Gerrit-PatchSet: 2 Gerrit-Project: ovirt-engine Gerrit-Branch: master Gerrit-Owner: Eli Mesika <emesika(a)redhat.com&gt; Gerrit-Reviewer: Eli Mesika <emesika(a)redhat.com&gt; Gerrit-Reviewer: Oved Ourfali <oourfali(a)redhat.com&gt;