Fix NPEs on Module loading
Merged conflicts