Change in ovirt-engine[master]: core: Remove option after checking null