Fixed an error case where unhandled exceptions would be thrown by
savePictures/AlbumsXML functions.
Merge branch 'master' of https://github.com/bsanders/softeng