Fixed bug that causes mvn to stop on error
Made last fix optional with parameter