Jjgarcia/fail when script fails

This can be merged but it won't be installed yet in our test machines in Jenkins, because some changes need to reach the qa stage before this can be installed.