diff --git a/CMakeLists.txt b/CMakeLists.txt
index c7c29a5e518..b562f7d7fcd 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -1,5 +1,5 @@
 # Top level CMakeLists.txt for CGAL-branchbuild
-project(CGAL)
+project(CGAL CXX)
 
 cmake_minimum_required(VERSION 2.6.2)
 
@@ -26,10 +26,19 @@ if ( ${CGAL_SCM_NAME} STREQUAL "svn" )
   find_program(SVN_EXECUTABLE svn DOC "subversion command line client")
 
   function(Subversion_GET_URL dir variable)
+    execute_process(COMMAND cygpath "${dir}"
+       OUTPUT_VARIABLE dir_cygpath
+       RESULT_VARIABLE cygpath_error)
     # use svnversion
     execute_process(COMMAND "${SVN_EXECUTABLE}" info --xml "${dir}"
       OUTPUT_VARIABLE ${variable}
-      OUTPUT_STRIP_TRAILING_WHITESPACE)
+      OUTPUT_STRIP_TRAILING_WHITESPACE
+      RESULT_VARIABLE svn_error)
+    if(svn_error)
+      execute_process(COMMAND "${SVN_EXECUTABLE}" info --xml "${dir_cygpath}"
+        OUTPUT_VARIABLE ${variable}
+        OUTPUT_STRIP_TRAILING_WHITESPACE)
+    endif()
     string(REGEX REPLACE ".*<url>([^<]+)</url>.*" "\\1" ${variable} "${${variable}}")
     if(NOT variable)
       message("Warning: can not get the Subversion URL of directory ${dir}")
diff --git a/Installation/CMakeLists.txt b/Installation/CMakeLists.txt
index b89d581aa12..c13744c9cb6 100644
--- a/Installation/CMakeLists.txt
+++ b/Installation/CMakeLists.txt
@@ -134,10 +134,19 @@ if ( CGAL_BRANCH_BUILD )
   if ( ${CGAL_SCM_NAME} STREQUAL "svn" )
 
     function(Subversion_GET_REVISION dir variable)
+      execute_process(COMMAND cygpath "${dir}"
+         OUTPUT_VARIABLE dir_cygpath
+         RESULT_VARIABLE cygpath_error)
       # use svnversion
       execute_process(COMMAND "${SVN_EXECUTABLE}" info --xml "${dir}"
         OUTPUT_VARIABLE ${variable}
-        OUTPUT_STRIP_TRAILING_WHITESPACE)
+        OUTPUT_STRIP_TRAILING_WHITESPACE
+        RESULT_VARIABLE svn_error)
+      if(svn_error)
+        execute_process(COMMAND "${SVN_EXECUTABLE}" info --xml "${dir_cygpath}"
+          OUTPUT_VARIABLE ${variable}
+          OUTPUT_STRIP_TRAILING_WHITESPACE)
+      endif()
       string(REGEX REPLACE "^(.*\n)?   revision=\"([^\n]+)\".*url.*" "\\2" ${variable} "${${variable}}")
       if(NOT variable)
         message("Warning: can not get the Subversion revision of directory ${dir}")
diff --git a/Mesh_2/include/CGAL/Mesh_2/Refine_edges.h b/Mesh_2/include/CGAL/Mesh_2/Refine_edges.h
index b096d1accb2..bd9fa7b24a9 100644
--- a/Mesh_2/include/CGAL/Mesh_2/Refine_edges.h
+++ b/Mesh_2/include/CGAL/Mesh_2/Refine_edges.h
@@ -421,6 +421,12 @@ public:
     zone.fh = triangulation_ref_impl().locate(p, zone.locate_type, zone.i, edge.first);
 
     const Face_handle n = f->neighbor(i);
+    CGAL_assertion_msg(zone.locate_type != Tr::FACE ||
+                       zone.fh == f || zone.fh == n,
+                       "Your data set contains at least a vertex that is "
+                       "very close to \n"
+                       "  a constrained edge! "
+                       "Mesh_2 cannot mesh that sort of data set.");
 
     const bool f_does_conflict = (zone.locate_type == Tr::EDGE) ||
       triangulation_ref_impl().test_conflict(p, f);