Fix NPE caused by registration being called onLoad now
Enforce locks for ModuleRegistrat