Fixed up XML file name/paths.
Added some useful error messages.