Merge "Avoid exiting the script if an error happens"