fix for when course submitted is null
Merge remote-tracking branch 'upstream/master'