Fix the build
Use a ConcurrentMap, thanks to @Donghwan
Rework #1773, add check from #1790
Reformat, no functional changes
Improve #1780. Do not log as warn as it will confuse people. Those exceptions are properly handled by the framework so it's better to not scare everyone