Since the creating new settings objects on every lookup has been fixed,
revert WarlockClient to the initial fix.
Fix NPE on shutdown