FIX: Error when serializing null value in Company object