Fixing NPE when reading configuration.
Removing commented code.
Fixing concurrency issues.
mend

Fixing concurrency issues.