Merge "mw.loader: Improve error logging"