bugfix : avoid to check type if value is null