KFSCNTRB-1459 Removed jira comments and added null checks by
ObjectUtils.