NXP-15035 check if entry exist before trying to delete when needed
Merge branch 'feature-NXP-15035-MultiDirectory-exception'