Fixed issue with multi-modules. Fixed potentials NPE's