Merge "Fix exception handling in scheduler" into feature/zuulv3