Catch another exception.
Added test cases for tense_chooser.
Removed debug statements.
Changed stuff to meet changed interface of some classes.