diff --git a/src/av/AvInfo.cpp b/src/av/AvInfo.cpp
index 68390e30..ba320c0e 100644
--- a/src/av/AvInfo.cpp
+++ b/src/av/AvInfo.cpp
@@ -79,7 +79,7 @@ MediaFile::open(void)
 	int error = avformat_open_input(&_context, _p.string().c_str(), nullptr, nullptr);
 	if (error < 0)
 	{
-		LMS_LOG(AV, ERROR) << "Cannot open '" << _p.string() << "', avformat_open_input returned " << averror_to_string(error);
+		LMS_LOG(AV, ERROR) << "Cannot open '" << _p.string() << "': " << averror_to_string(error);
 		return false;
 	}
 
@@ -95,7 +95,7 @@ MediaFile::scan(void)
 	int error = avformat_find_stream_info(_context, nullptr);
 	if (error < 0)
 	{
-		LMS_LOG(AV, ERROR) << "Cannot find stream information: '" << averror_to_string(error);
+		LMS_LOG(AV, ERROR) << "Cannot find stream information on '" << _p.string() << "': " << averror_to_string(error);
 		return false;
 	}
 
diff --git a/src/database-updater/DatabaseUpdater.cpp b/src/database-updater/DatabaseUpdater.cpp
index f6746ca4..c747713d 100644
--- a/src/database-updater/DatabaseUpdater.cpp
+++ b/src/database-updater/DatabaseUpdater.cpp
@@ -84,6 +84,8 @@ isFileSupported(const boost::filesystem::path& file, const std::vector<boost::fi
 std::vector<boost::filesystem::path>
 getRootDirectoriesByType(Wt::Dbo::Session& session, Database::MediaDirectory::Type type)
 {
+	Wt::Dbo::Transaction transaction(session);
+
 	std::vector<boost::filesystem::path> res;
 	std::vector<Database::MediaDirectory::pointer> rootDirs = Database::MediaDirectory::getByType(session, type);
 
@@ -246,6 +248,9 @@ Updater::process(boost::system::error_code err)
 
 		for (RootDirectory rootDirectory : rootDirectories)
 		{
+			if (!_running)
+				break;
+
 			LMS_LOG(DBUPDATER, INFO) << "Processing root directory '" << rootDirectory.path << "'...";
 			processRootDirectory(rootDirectory, stats);
 			LMS_LOG(DBUPDATER, INFO) << "Processing root directory '" << rootDirectory.path << "' DONE";
@@ -376,53 +381,59 @@ Updater::getGenres( const std::list<std::string>& names)
 void
 Updater::processAudioFile( const boost::filesystem::path& file, Stats& stats)
 {
-	try {
-		// Check last update time
-		boost::posix_time::ptime lastWriteTime (boost::posix_time::from_time_t( boost::filesystem::last_write_time( file ) ) );
+	boost::posix_time::ptime lastWriteTime (boost::posix_time::from_time_t( boost::filesystem::last_write_time( file ) ) );
 
+	// Skip file if last write is the same
+	{
 		Wt::Dbo::Transaction transaction(_db.getSession());
 
 		Wt::Dbo::ptr<Track> track = Track::getByPath(_db.getSession(), file);
 
-		// Skip file if last write is the same
 		if (track && track->getLastWriteTime() == lastWriteTime)
 			return;
+	}
 
-		MetaData::Items items;
-		if (!_metadataParser.parse(file, items))
-			return;
+	MetaData::Items items;
+	if (!_metadataParser.parse(file, items))
+		return;
 
-		// We estimate this is a audio file if:
-		// - we found a least one audio stream
-		// - the duration is not null
-		if (items.find(MetaData::Type::AudioStreams) == items.end()
-		|| boost::any_cast<std::vector<MetaData::AudioStream> >(items[MetaData::Type::AudioStreams]).empty())
+	Wt::Dbo::Transaction transaction(_db.getSession());
+
+	Wt::Dbo::ptr<Track> track = Track::getByPath(_db.getSession(), file);
+
+	// We estimate this is a audio file if:
+	// - we found a least one audio stream
+	// - the duration is not null
+	if (items.find(MetaData::Type::AudioStreams) == items.end()
+			|| boost::any_cast<std::vector<MetaData::AudioStream> >(items[MetaData::Type::AudioStreams]).empty())
+	{
+		LMS_LOG(DBUPDATER, DEBUG) << "Skipped '" << file << "' (no audio stream found)";
+
+		// If Track exists here, delete it!
+		if (track)
 		{
-			LMS_LOG(DBUPDATER, DEBUG) << "Skipped '" << file << "' (no audio stream found)";
-
-			// If Track exists here, delete it!
-			if (track) {
-				track.remove();
-				stats.nbRemoved++;
-			}
-			return;
+			track.remove();
+			stats.nbRemoved++;
 		}
-		if (items.find(MetaData::Type::Duration) == items.end()
-		|| boost::any_cast<boost::posix_time::time_duration>(items[MetaData::Type::Duration]).total_seconds() <= 0)
+		return;
+	}
+	if (items.find(MetaData::Type::Duration) == items.end()
+			|| boost::any_cast<boost::posix_time::time_duration>(items[MetaData::Type::Duration]).total_seconds() <= 0)
+	{
+		LMS_LOG(DBUPDATER, DEBUG) << "Skipped '" << file << "' (no duration or duration <= 0)";
+
+		// If Track exists here, delete it!
+		if (track)
 		{
-			LMS_LOG(DBUPDATER, DEBUG) << "Skipped '" << file << "' (no duration or duration <= 0)";
-
-			// If Track exists here, delete it!
-			if (track) {
-				track.remove();
-				stats.nbRemoved++;
-			}
-			return;
+			track.remove();
+			stats.nbRemoved++;
 		}
+		return;
+	}
 
-		// ***** Title
-		std::string title;
-		if (items.find(MetaData::Type::Title) != items.end()) {
+	// ***** Title
+	std::string title;
+	if (items.find(MetaData::Type::Title) != items.end()) {
 			title = boost::any_cast<std::string>(items[MetaData::Type::Title]);
 		}
 		else
@@ -541,20 +552,12 @@ Updater::processAudioFile( const boost::filesystem::path& file, Stats& stats)
 		}
 
 		transaction.commit();
-	}
-	catch( std::exception& e )
-	{
-		LMS_LOG(DBUPDATER, ERROR) << "Exception while parsing audio file : '" << file << "': '" << e.what() << "' => skipping!";
-		stats.nbRemoved++;
-	}
 }
 
 
 void
 Updater::processRootDirectory(RootDirectory rootDirectory, Stats& stats)
 {
-	if (!_running)
-		return;
 
 	if (!boost::filesystem::exists(rootDirectory.path) || !boost::filesystem::is_directory(rootDirectory.path))
 		return;
@@ -641,49 +644,68 @@ Updater::checkFile(const boost::filesystem::path& p, const std::vector<boost::fi
 void
 Updater::checkAudioFiles( Stats& stats )
 {
-
 	LMS_LOG(DBUPDATER, INFO) << "Checking audio files...";
-	Wt::Dbo::Transaction transaction(_db.getSession());
 
+	std::vector<boost::filesystem::path> trackPaths = Track::getAllPaths(_db.getSession());;
 	std::vector<boost::filesystem::path> rootDirs = getRootDirectoriesByType(_db.getSession(), Database::MediaDirectory::Audio);
 
 	LMS_LOG(DBUPDATER, DEBUG) << "Checking tracks...";
-	auto tracks = Track::getAll(_db.getSession());
-	for (auto track : tracks)
+	for (auto& trackPath : trackPaths)
 	{
-		if (!checkFile(track->getPath(), rootDirs, _audioExtensions))
+		if (!_running)
+			return;
+
+		if (!checkFile(trackPath, rootDirs, _audioExtensions))
 		{
-			track.remove();
-			stats.nbRemoved++;
+			Wt::Dbo::Transaction transaction(_db.getSession());
+
+			Track::pointer track = Track::getByPath(_db.getSession(), trackPath);
+			if (track)
+			{
+				track.remove();
+				stats.nbRemoved++;
+			}
 		}
 	}
 
-	// Now process orphan Genre (no track)
 	LMS_LOG(DBUPDATER, DEBUG) << "Checking Genres...";
-	auto genres = Genre::getAll(_db.getSession());
-	for (auto genre : genres)
 	{
-		if (genre->getTracks().size() == 0)
+		Wt::Dbo::Transaction transaction(_db.getSession());
+
+		// Now process orphan Genre (no track)
+		auto genres = Genre::getAll(_db.getSession());
+		for (auto genre : genres)
 		{
-			LMS_LOG(DBUPDATER, DEBUG) << "Removing orphan genre '" << genre->getName() << "'";
-			genre.remove();
+			if (genre->getTracks().size() == 0)
+			{
+				LMS_LOG(DBUPDATER, DEBUG) << "Removing orphan genre '" << genre->getName() << "'";
+				genre.remove();
+			}
 		}
 	}
 
 	LMS_LOG(DBUPDATER, DEBUG) << "Checking artists...";
-	auto artists = Artist::getAllOrphans(_db.getSession());
-	for (auto artist : artists)
 	{
-		LMS_LOG(DBUPDATER, DEBUG) << "Removing orphan artist '" << artist->getName() << "'";
-		artist.remove();
+		Wt::Dbo::Transaction transaction(_db.getSession());
+
+		auto artists = Artist::getAllOrphans(_db.getSession());
+		for (auto artist : artists)
+		{
+			LMS_LOG(DBUPDATER, DEBUG) << "Removing orphan artist '" << artist->getName() << "'";
+			artist.remove();
+		}
 	}
 
 	LMS_LOG(DBUPDATER, DEBUG) << "Checking releases...";
-	auto releases = Release::getAllOrphans(_db.getSession());
-	for (auto release : releases)
 	{
-		LMS_LOG(DBUPDATER, DEBUG) << "Removing orphan release '" << release->getName() << "'";
-		release.remove();
+		Wt::Dbo::Transaction transaction(_db.getSession());
+
+		auto releases = Release::getAllOrphans(_db.getSession());
+		for (auto release : releases)
+		{
+			LMS_LOG(DBUPDATER, DEBUG) << "Removing orphan release '" << release->getName() << "'";
+			release.remove();
+		}
 	}
 
 	LMS_LOG(DBUPDATER, INFO) << "Check audio files done!";
@@ -692,23 +714,25 @@ Updater::checkAudioFiles( Stats& stats )
 void
 Updater::checkVideoFiles( Stats& stats )
 {
-	LMS_LOG(DBUPDATER, DEBUG) << "Checking video files...";
-	Wt::Dbo::Transaction transaction(_db.getSession());
-
 	std::vector<boost::filesystem::path> rootDirs = getRootDirectoriesByType(_db.getSession(), Database::MediaDirectory::Video);
+	std::vector<boost::filesystem::path> videoPaths = Video::getAllPaths(_db.getSession());
 
 	LMS_LOG(DBUPDATER, DEBUG) << "Checking videos...";
-	typedef Wt::Dbo::collection< Wt::Dbo::ptr<Video> > Videos;
-	Videos videos = Video::getAll(_db.getSession());
-
-	for (Videos::iterator it = videos.begin(); it != videos.end(); ++it)
+	for (auto& videoPath : videoPaths)
 	{
-		Video::pointer video = (*it);
+		if (!_running)
+			return;
 
-		if (!checkFile(video->getPath(), rootDirs, _videoExtensions))
+		if (!checkFile(videoPath, rootDirs, _videoExtensions))
 		{
-			video.remove();
-			stats.nbRemoved++;
+			Wt::Dbo::Transaction transaction(_db.getSession());
+
+			Video::pointer video = Video::getByPath(_db.getSession(), videoPath);
+			if (video)
+			{
+				video.remove();
+				stats.nbRemoved++;
+			}
 		}
 	}
 
diff --git a/src/database/Track.cpp b/src/database/Track.cpp
index 7ad69914..cf78eac0 100644
--- a/src/database/Track.cpp
+++ b/src/database/Track.cpp
@@ -77,6 +77,14 @@ Track::create(Wt::Dbo::Session& session, const boost::filesystem::path& p)
 	return session.add(new Track(p) );
 }
 
+std::vector<boost::filesystem::path>
+Track::getAllPaths(Wt::Dbo::Session& session)
+{
+	Wt::Dbo::Transaction transaction(session);
+	Wt::Dbo::collection<std::string> res = session.query<std::string>("SELECT file_path from track");
+	return std::vector<boost::filesystem::path>(res.begin(), res.end());
+}
+
 std::vector< Genre::pointer >
 Track::getGenres(void) const
 {
diff --git a/src/database/Track.hpp b/src/database/Track.hpp
index 36e22269..17d4f809 100644
--- a/src/database/Track.hpp
+++ b/src/database/Track.hpp
@@ -52,8 +52,7 @@ class Genre
 		static pointer getByName(Wt::Dbo::Session& session, const std::string& name);
 		static pointer getNone(Wt::Dbo::Session& session);
 		static std::vector<pointer> getByFilter(Wt::Dbo::Session& session, SearchFilter filter, int offset = -1, int size = -1);
-		static Wt::Dbo::collection<pointer> getAll(Wt::Dbo::Session& session);
-
+		static Wt::Dbo::collection<Genre::pointer> getAll(Wt::Dbo::Session& session);
 		// MVC models for the user interface
 		// Genre ID, name, track count
 		typedef boost::tuple<id_type, std::string, int> UIQueryResult;
@@ -106,6 +105,7 @@ class Track
 		static pointer getByMBID(Wt::Dbo::Session& session, const std::string& MBID);
 		static std::vector<pointer> 	getByFilter(Wt::Dbo::Session& session, SearchFilter filter, int offset = -1, int size = -1);
 		static Wt::Dbo::collection< pointer > getAll(Wt::Dbo::Session& session);
+		static std::vector<boost::filesystem::path> getAllPaths(Wt::Dbo::Session& session);
 
 		// Utility fonctions
 		// MVC models for the user interface
diff --git a/src/database/Video.cpp b/src/database/Video.cpp
index 5d2061cb..6568604d 100644
--- a/src/database/Video.cpp
+++ b/src/database/Video.cpp
@@ -48,4 +48,12 @@ Video::getByPath(Wt::Dbo::Session& session, const boost::filesystem::path& p)
 	return session.find<Video>().where("path = ?").bind(p.string());
 }
 
+std::vector<boost::filesystem::path>
+Video::getAllPaths(Wt::Dbo::Session& session)
+{
+	Wt::Dbo::Transaction transaction(session);
+	Wt::Dbo::collection<std::string> res = session.query<std::string>("SELECT path from video");
+	return std::vector<boost::filesystem::path>(res.begin(), res.end());
+}
+
 } // namespace Video
diff --git a/src/database/Video.hpp b/src/database/Video.hpp
index 1d78833c..fb63c24c 100644
--- a/src/database/Video.hpp
+++ b/src/database/Video.hpp
@@ -43,7 +43,7 @@ class Video
 		// Find utilities
 		static pointer getByPath(Wt::Dbo::Session& session, const boost::filesystem::path& p);
 		static Wt::Dbo::collection< pointer > getAll(Wt::Dbo::Session& session);
-		static Wt::Dbo::collection< pointer > getByParentPath(Wt::Dbo::Session& session, const boost::filesystem::path& p);
+		static std::vector<boost::filesystem::path> getAllPaths(Wt::Dbo::Session& session);
 
 		// Create utility
 		static pointer	create(Wt::Dbo::Session& session, const boost::filesystem::path& p);