Change in ovirt-engine[master]: aaa: fix misc null pointer exceptions