make sure the answers are not null, first
Merge branch '1.12'