Maor Lipchuk has submitted this change and it was merged. Change subject: core: fixed NPE during removal of floating disk (#845046) ...................................................................... core: fixed NPE during removal of floating disk (#845046) https://bugzilla.redhat.com/show_bug.cgi?id=845046 when trying to remove a floating disk NPE was encountered beacuse of the use of NGuid.createGuidFromString (who can return null) instead of Guid.createGuidFromString who on DiskImageMapper. The current change provides null check and equality check to Guid.Empty in order to not affect other flows that count on null on that property. Change-Id: I6ffca77cc5a02558847366dd8ccb886ee515d612 Signed-off-by: Liron Aravot <laravot(a)redhat.com&gt; --- M backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/RemoveImageCommand.java 1 file changed, 9 insertions(+), 5 deletions(-) Approvals: Maor Lipchuk: Verified; Looks good to me, approved -- To view, visit http://gerrit.ovirt.org/6861 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: merged Gerrit-Change-Id: I6ffca77cc5a02558847366dd8ccb886ee515d612 Gerrit-PatchSet: 5 Gerrit-Project: ovirt-engine Gerrit-Branch: master Gerrit-Owner: Liron Aravot <laravot(a)redhat.com&gt; Gerrit-Reviewer: Allon Mureinik <amureini(a)redhat.com&gt; Gerrit-Reviewer: Daniel Erez <derez(a)redhat.com&gt; Gerrit-Reviewer: Liron Aravot <laravot(a)redhat.com&gt; Gerrit-Reviewer: Maor Lipchuk <mlipchuk(a)redhat.com&gt;