Correctly handle incorrect answers

Change-Id: I9dca1f823dd2fb41573dfe40a1274b17d29c9aee