Omer Frenkel has submitted this change and it was merged. Change subject: core: fix NPE for removing non existing template ...................................................................... core: fix NPE for removing non existing template The locking message assume the template being removed exist in the DB, therefore NPE can be thrown there. Added a null check and in case the template is null, we won't try to lock the template (that is ok since the can-do-action phase is going to fail anyway). Change-Id: Id3eeb1d34d4e6320961ee8b360715b29003f1a68 Signed-off-by: Omer Frenkel <ofrenkel(a)redhat.com&gt; Signed-off-by: Arik Hadas <ahadas(a)redhat.com&gt; --- M backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/RemoveVmTemplateCommand.java 1 file changed, 5 insertions(+), 2 deletions(-) Approvals: Omer Frenkel: Looks good to me, approved Arik Hadas: Verified -- To view, visit http://gerrit.ovirt.org/14712 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: merged Gerrit-Change-Id: Id3eeb1d34d4e6320961ee8b360715b29003f1a68 Gerrit-PatchSet: 4 Gerrit-Project: ovirt-engine Gerrit-Branch: master Gerrit-Owner: Omer Frenkel <ofrenkel(a)redhat.com&gt; Gerrit-Reviewer: Allon Mureinik <amureini(a)redhat.com&gt; Gerrit-Reviewer: Arik Hadas <ahadas(a)redhat.com&gt; Gerrit-Reviewer: Omer Frenkel <ofrenkel(a)redhat.com&gt; Gerrit-Reviewer: Roy Golan <rgolan(a)redhat.com&gt; Gerrit-Reviewer: oVirt Jenkins CI Server