Small changes and testing of Scanner ErrorHandler scheme.