Revert to null check
Add test for answering discretionary follow-up questions