Changed course to be able to be null in AA / throw error in Repeat