Fixed up XML file name/paths.
Merge branch 'develop'
Added some useful error messages.
Merge branch 'develop'