- null pointer access avoided
- obsolete code deleted
- cleanup on match finish extended