Bugfixes.
*  Consistently use "reader" instead of "terminal"
*  Fix a possible NPE after an exception stacktrace.