Fix a double free on error recovering
Merge branch 'master' into cmake_support