Null check added since ConcurrentHashMap cannot deal with nulls
Naming lookup for master container removed, since on some systems it takes a long time to timeout