diff --git a/ChangeLog b/ChangeLog
index e6a573ce..7eddbe57 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,6 +1,12 @@
 2009-02-09  Curtis Gedak  <gedakc@gmail.com>
 
-	* README: Added -02-06  Curtis Gedak  <gedakc@gmail.com>
+	* src/Win_GParted.cc: Fixed crash on startup with Russian language.
+	  - Thanks to Dmitriy Motitskiy for small patch.
+	  - Closes GParted bug #570855
+
+	* README: Added note blkid is used for ext4 detection.
+
+2009-02-06  Curtis Gedak  <gedakc@gmail.com>
 
 	* configure.in: Append -svn to version for continuing development
 
diff --git a/src/Win_GParted.cc b/src/Win_GParted.cc
index c65ac6b1..5470064b 100644
--- a/src/Win_GParted.cc
+++ b/src/Win_GParted.cc
@@ -229,8 +229,11 @@ void Win_GParted::init_toolbar()
 	//  FIXME:  Is there a better way to do this, perhaps without the conditional?  At the moment this seems to be the best compromise.
 	bool display_undo = true ;
 	if( str_temp .length() > 14 ) {
-		str_temp .replace( str_temp .find( "/" ), 1, "\n/" ) ;
-		display_undo = false ;
+		size_t index = str_temp .find( "/" ) ;
+		if ( index != Glib::ustring::npos ) {
+			str_temp .replace( index, 1, "\n/" ) ;
+			display_undo = false ;
+		}
 	}
 	toolbutton = Gtk::manage(new Gtk::ToolButton( *image, str_temp ));
 	toolbutton ->signal_clicked().connect( sigc::mem_fun(*this, &Win_GParted::activate_resize) );