diff --git a/configure.ac b/configure.ac
index 0de27e5b59..978babc572 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,6 +1,6 @@
 dnl Process with autoconf to generate configure script   -*- sh -*-
 
-AC_INIT(LyX,1.4.0,[lyx-devel@lists.lyx.org],[lyx])
+AC_INIT(LyX,1.4.0svn,[lyx-devel@lists.lyx.org],[lyx])
 AC_PREREQ(2.52)
 AC_CONFIG_SRCDIR(src/main.C)
 AC_CONFIG_HEADERS([src/config.h])
diff --git a/src/graphics/ChangeLog b/src/graphics/ChangeLog
index 00ec15395c..4080237982 100644
--- a/src/graphics/ChangeLog
+++ b/src/graphics/ChangeLog
@@ -1,3 +1,7 @@
+2006-02-17  Georg Baum  <Georg.Baum@post.rwth-aachen.de>
+
+	* GraphicsCacheItem.C (findTargetFormat): fix previous fix
+
 2006-01-11  Georg Baum  <Georg.Baum@post.rwth-aachen.de>
 
 	* GraphicsCacheItem.C (convertToDisplayFormat): handle unknown
diff --git a/src/graphics/GraphicsCacheItem.C b/src/graphics/GraphicsCacheItem.C
index 4c11ed6b98..ee9441d125 100644
--- a/src/graphics/GraphicsCacheItem.C
+++ b/src/graphics/GraphicsCacheItem.C
@@ -335,9 +335,12 @@ string const findTargetFormat(string const & from)
 	typedef lyx::graphics::Image::FormatList FormatList;
 	FormatList const formats = lyx::graphics::Image::loadableFormats();
 
+	 // There must be a format to load from.
+	BOOST_ASSERT(!formats.empty());
+
 	// Use the standard converter if we don't know the format to load
 	// from.
-	if (!formats.empty())
+	if (from.empty())
 		return string("ppm");
 
 	// First ascertain if we can load directly with no conversion