fix crash when there's no correct answer
Merge branch 'master' into epa