Various test tidying.

2 files changed, 3 insertions, 3 deletions

diff --git a/src/dcp.cc b/src/dcp.cc
index ae692256..7748a97f 100644
--- a/src/dcp.cc
+++ b/src/dcp.cc
@@ -228,12 +228,12 @@ DCP::read_assets ()
 			if (boost::filesystem::exists (p)) {
 				asset_map.reset (new libdcp::parse::AssetMap (p.string ()));
 			} else {
-				boost::throw_exception (DCPReadError ("could not find AssetMap file"));
+				boost::throw_exception (FileError ("could not find AssetMap file", p, -1));
 			}
 		}
 		
 	} catch (FileError& e) {
-		boost::throw_exception (FileError ("could not load AssetMap file", _files.asset_map, e.number ()));
+		boost::throw_exception (FileError ("could not load AssetMap file", e.filename(), e.number ()));
 	}
 
 	for (list<shared_ptr<libdcp::parse::AssetMapAsset> >::const_iterator i = asset_map->assets.begin(); i != asset_map->assets.end(); ++i) {
diff --git a/src/exceptions.cc b/src/exceptions.cc
index 6a32a33f..951627a5 100644
--- a/src/exceptions.cc
+++ b/src/exceptions.cc
@@ -24,7 +24,7 @@ using std::string;
 using namespace libdcp;
 
 FileError::FileError (std::string const & message, boost::filesystem::path filename, int number)
-	: _message (String::compose ("%1 (error %2) (%3)", message, filename.string(), number))
+	: _message (String::compose ("%1 (%2) (error %3)", message, filename.string(), number))
 	, _filename (filename)
 	, _number (number)
 {