4849 module load errors

Core part of the fix.