CLOUDIFY-1375, improved null check