Added filename to page dict.
Added messages to exceptions.