Added check for too many variables in answer -- see previous commit for details.
Authored by: tswift 2016-01-26
Parent: [r8601]
Child: [r8603]