Fix app crashing on course load sometimes.
Merge remote-tracking branch 'origin/master'