CLEREZZA-933: Added null check