Source builds: Better handling of failure case

Better merge the other one first.