Improvements to error handing on source load.