diff --git a/ChangeLog b/ChangeLog
index 728b459d6..e6a1d7a33 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2012-01-27  Moritz Bunkus  <moritz@bunkus.org>
+
+	* mkvpropedit, mmg: bug fix: Trying to modify a file located in a
+	path mounted with GVFS SFTP will no longer crash the
+	programs. Instead an error message is output if an error
+	occurs. Fix for bug 710.
+
 2012-01-25  Moritz Bunkus  <moritz@bunkus.org>
 
 	* mkvmerge: bug fix: Fixed integer underflows in the read caching
diff --git a/src/common/kax_analyzer.cpp b/src/common/kax_analyzer.cpp
index 5b59e4650..adaf6132a 100644
--- a/src/common/kax_analyzer.cpp
+++ b/src/common/kax_analyzer.cpp
@@ -344,6 +344,10 @@ kax_analyzer_c::update_element(EbmlElement *e,
   } catch (kax_analyzer_c::update_element_result_e result) {
     debug_dump_elements_maybe("update_element_exception");
     return result;
+
+  } catch (mtx::mm_io::exception &ex) {
+    mxdebug_if(m_debugging_requested, boost::format("I/O exception: %1%\n") % ex.what());
+    return uer_error_unknown;
   }
 
   return uer_success;