Change in ovirt-engine[master]: engine: Added null check to avoid NPE