Modify placement of null checking condition

ACE-85