Merge "Do not exit early on errors when -f is specified"