BUGFIX Concurrency : NullPointerException +
ConcurrentModificationException