Added null check for activationId for Functionalizing entity