CCLOUDIFY-1375, added null assertion